device-generic-x86_64: install all linux-firmware by default (MR 4794)

This installs all linux-firmware by default (using pmb_recommends) in a
way that allows for users to remove extraneous fw if they want.

The old `nonfree-firmware` packages have been dropped since pmbootstrap
no longer conditionally installs these.
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Clayton Craft 2024-02-06 04:40:08 -08:00
parent c6306cb9bb
commit 94de94e598
No known key found for this signature in database
GPG key ID: 7A342565FF635F79

View file

@ -2,7 +2,7 @@
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=12 pkgver=12
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="x86_64" arch="x86_64"
@ -22,11 +22,9 @@ subpackages="
$pkgname-kernel-edge:kernel_edge $pkgname-kernel-edge:kernel_edge
$pkgname-kernel-lts:kernel_lts $pkgname-kernel-lts:kernel_lts
$pkgname-mesa $pkgname-mesa
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-nonfree-firmware-amd:nonfree_firmware_amd
$pkgname-nonfree-firmware-intel:nonfree_firmware_intel
" "
_pmb_recommends=" _pmb_recommends="
linux-firmware
oem-intel oem-intel
oem-amd oem-amd
" "
@ -65,26 +63,6 @@ kernel_lts() {
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
} }
nonfree_firmware() {
pkgdesc="Firmware for x86_64 devices"
mkdir -p "$subpkgdir"
}
nonfree_firmware_amd() {
install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-amd"
depends="oem-amd-nonfree-firmware"
mkdir -p "$subpkgdir"
}
nonfree_firmware_intel() {
install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-intel"
depends="oem-intel-nonfree-firmware"
mkdir -p "$subpkgdir"
}
sha512sums=" sha512sums="
33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a deviceinfo 33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a deviceinfo
cf9ad3e80b43aa799a8123289e3ab77f6a1c37cee3d48db737688b93afd4f1094db76008ec0f28358c35dd1e115c4fabf9452f9abee76481a2630f02e3ae0953 modules-initfs cf9ad3e80b43aa799a8123289e3ab77f6a1c37cee3d48db737688b93afd4f1094db76008ec0f28358c35dd1e115c4fabf9452f9abee76481a2630f02e3ae0953 modules-initfs