forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
We want both klimtwifi and klimtlte to be able to depend on
firmware-samsung-klimt, for both their downstream and mainline kernel
variants.

Previously we used install_if like:
install_if="device-samsung-klimtlte-kernel-mainline" which will only
work for klimtlte and not klimtwifi.  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-25 19:37:42 +02:00 committed by Clayton Craft
parent a078aa3c62
commit 7af2394e0c
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
device/testing/device-samsung-klimtlte/APKBUILD
View file

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

6
device/testing/firmware-samsung-klimt/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname=firmware-samsung-klimt pkgname=firmware-samsung-klimt
pkgver=2.1 pkgver=3.0
pkgrel=0 pkgrel=0
pkgdesc="Firmware for Samsung klimtwifi and klimtlte" pkgdesc="Firmware for Samsung klimtwifi and klimtlte"
url="https://github.com/exynos5420/android_vendor_samsung_klimt-common" url="https://github.com/exynos5420/android_vendor_samsung_klimt-common"
@ -9,7 +9,7 @@ options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
subpackages=" subpackages="
$pkgname-downstream:downstream $pkgname-downstream:downstream
$pkgname-mainline:mainline $pkgname-mainline:mainline
" "
_klimt_commit="cedd082ae12290218c2c33ffd31bbecc713b7cd9" _klimt_commit="cedd082ae12290218c2c33ffd31bbecc713b7cd9"
_klimt_url="https://github.com/exynos5420/android_vendor_samsung_klimt-common/raw/$_klimt_commit" _klimt_url="https://github.com/exynos5420/android_vendor_samsung_klimt-common/raw/$_klimt_commit"
@ -33,7 +33,6 @@ package() {
downstream() { downstream() {
pkgdesc="Firmware for Samsung klimt* when using downstream kernel" pkgdesc="Firmware for Samsung klimt* when using downstream kernel"
install_if="device-samsung-klimtlte-kernel-downstream"
depends="firmware-samsung-exynos5420-downstream" depends="firmware-samsung-exynos5420-downstream"
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
@ -46,7 +45,6 @@ downstream() {
mainline() { mainline() {
pkgdesc="Firmware for Samsung klimt* when using mainline kernel" pkgdesc="Firmware for Samsung klimt* when using mainline kernel"
install_if="device-samsung-klimtlte-kernel-mainline"
depends="linux-firmware-s5p-mfc" depends="linux-firmware-s5p-mfc"
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
} }