From 654b9dc36e5a996dc575deadba19773048382261 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 8 Oct 2023 11:46:31 +0200 Subject: [PATCH] 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. --- .../device-samsung-chagallwifi/APKBUILD | 19 +++++++++++++++++-- .../testing/firmware-samsung-chagall/APKBUILD | 4 +--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/device/testing/device-samsung-chagallwifi/APKBUILD b/device/testing/device-samsung-chagallwifi/APKBUILD index 774eaafc1..6f22ee450 100644 --- a/device/testing/device-samsung-chagallwifi/APKBUILD +++ b/device/testing/device-samsung-chagallwifi/APKBUILD @@ -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" } diff --git a/device/testing/firmware-samsung-chagall/APKBUILD b/device/testing/firmware-samsung-chagall/APKBUILD index d9ea18390..0360cb699 100644 --- a/device/testing/firmware-samsung-chagall/APKBUILD +++ b/device/testing/firmware-samsung-chagall/APKBUILD @@ -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" }