samsung-chagallwifi: select firmware pkg variant in device package (MR 4721)

We want both chagallwifi and chagalllte to be able to depend on
firmware-samsung-chagall, for both their downstream and mainline
kernel variants.

Previously we used install_if like:
install_if="device-samsung-chagallwifi-kernel-mainline"
which will only work for chagallwifi and not chagalllte.  Instead we
add two nonfree subpackages to the device packages that install_if's
depending on kernel choice.
This commit is contained in:
Henrik Grimler 2023-10-08 11:46:31 +02:00 committed by Clayton Craft
parent 4c89adb645
commit 654b9dc36e
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 18 additions and 5 deletions

View file

@ -20,6 +20,8 @@ subpackages="
$pkgname-kernel-downstream:kernel_downstream
$pkgname-kernel-mainline:kernel_mainline
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-nonfree-firmware-downstream:nonfree_firmware_downstream
$pkgname-nonfree-firmware-mainline:nonfree_firmware_mainline
"
build() {
@ -47,8 +49,21 @@ kernel_mainline() {
}
nonfree_firmware() {
pkgdesc="Non-free firmware for the Samsung Galaxy Tab S"
depends="firmware-samsung-chagall"
pkgdesc="Non-free firmware for the Samsung Galaxy Tab S 10.5"
mkdir "$subpkgdir"
}
nonfree_firmware_downstream() {
pkgdesc="Non-free firmware for chagallwifi when using downstream kernel"
install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware=$pkgver-r$pkgrel $pkgname-kernel-downstream"
depends="firmware-samsung-chagall-downstream>=3.0-r0"
mkdir "$subpkgdir"
}
nonfree_firmware_mainline() {
pkgdesc="Non-free firmware for chagallwifi when using mainline kernel"
install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware=$pkgver-r$pkgrel $pkgname-kernel-mainline"
depends="firmware-samsung-chagall-mainline>=3.0-r0"
mkdir "$subpkgdir"
}

View file

@ -1,5 +1,5 @@
pkgname=firmware-samsung-chagall
pkgver=2.1
pkgver=3.0
pkgrel=0
pkgdesc="Firmware for Samsung chagallwifi and chagalllte"
url="https://github.com/TheMuppets/proprietary_vendor_samsung"
@ -26,7 +26,6 @@ package() {
downstream() {
pkgdesc="Firmware for Samsung chagall* when using downstream kernel"
install_if="device-samsung-chgallwifi-kernel-downstream"
depends="firmware-samsung-exynos5420-downstream"
mkdir -p "$subpkgdir"
# Wifi
@ -39,7 +38,6 @@ downstream() {
mainline() {
pkgdesc="Firmware for Samsung chagall* when using mainline kernel"
install_if="device-samsung-chagallwifi-kernel-mainline"
depends="linux-firmware-s5p-mfc"
mkdir -p "$subpkgdir"
}