a71-pmos/pmaports-a71
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device-generic-x86_64: only include i915 fw when oem-intel is installed (MR 5564)

Browse Source 
fixes #3160
This commit is contained in:
Clayton Craft 2024-09-06 09:48:46 -07:00 committed by Oliver Smith
parent 1a203da83c
commit fa99810a08
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
device/community/device-generic-x86_64/30-gpu-firmware.files → device/community/device-generic-x86_64/30-gpu-i915-firmware.files
View File

16
device/community/device-generic-x86_64/APKBUILD
View File

@ -2,7 +2,7 @@
# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=device-generic-x86_64 pkgname=device-generic-x86_64
pkgdesc="Generic x86_64 system, with EFI" pkgdesc="Generic x86_64 system, with EFI"
pkgver=15 pkgver=16
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
@ -17,10 +17,11 @@ makedepends="devicepkg-dev"
source=" source="
deviceinfo deviceinfo
modules-initfs modules-initfs
30-gpu-firmware.files 30-gpu-i915-firmware.files
" "
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
subpackages=" subpackages="
$pkgname-intel
$pkgname-kernel-edge:kernel_edge $pkgname-kernel-edge:kernel_edge
$pkgname-kernel-lts:kernel_lts $pkgname-kernel-lts:kernel_lts
" "
@ -41,9 +42,14 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname devicepkg_package $startdir $pkgname
}
install -Dm644 "$srcdir"/30-gpu-firmware.files \ intel() {
-t "$pkgdir"/usr/share/mkinitfs/files/ pkgdesc="Intel-specific configuration"
install_if="$pkgname=$pkgver-r$pkgrel oem-intel"
install -Dm644 "$srcdir"/30-gpu-i915-firmware.files \
-t "$subpkgdir"/usr/share/mkinitfs/files/
} }
kernel_edge() { kernel_edge() {
@ -65,5 +71,5 @@ kernel_lts() {
sha512sums=" sha512sums="
e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb deviceinfo e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb deviceinfo
e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019 modules-initfs e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019 modules-initfs
9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881 30-gpu-firmware.files 9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881 30-gpu-i915-firmware.files
" "