device-fairphone-fp4: drop nonfree firmware subpackage (MR 5290)

The device already loads plenty of nonfree-firmware into the
co-processors during the bootloader stages, and also once booted in
Linux won't really be useful without everything.

Additionally I doubt anyone tests that case, so just require nonfree
firmware unconditionally to simplify maintenance.
This commit is contained in:
Luca Weiss 2024-06-28 15:09:08 +02:00 committed by jane400
parent cdb5b2873e
commit 86fa840915
No known key found for this signature in database
GPG key ID: 9901C7B82A702241
3 changed files with 17 additions and 27 deletions

View file

@ -10,14 +10,29 @@ arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends=" depends="
bootmac bootmac
firmware-fairphone-fp4-adreno
firmware-fairphone-fp4-adsp
firmware-fairphone-fp4-bluetooth
firmware-fairphone-fp4-cdsp
firmware-fairphone-fp4-ipa
firmware-fairphone-fp4-modem
firmware-fairphone-fp4-wlan
firmware-qcom-adreno-a630
linux-firmware-ath10k
linux-postmarketos-qcom-sm6350 linux-postmarketos-qcom-sm6350
make-dynpart-mappings make-dynpart-mappings
mesa-vulkan-freedreno mesa-vulkan-freedreno
mkbootimg mkbootimg
msm-modem
msm-modem-uim-selection
pd-mapper
pd-mapper-openrc
postmarketos-base postmarketos-base
qbootctl qbootctl
qbootctl-openrc qbootctl-openrc
swclock-offset swclock-offset
tqftpserv
tqftpserv-openrc
" "
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
@ -26,9 +41,6 @@ source="
deviceinfo deviceinfo
modules-initfs modules-initfs
" "
subpackages="
$pkgname-nonfree-firmware:nonfree_firmware
"
build() { build() {
devicepkg_build $startdir $pkgname devicepkg_build $startdir $pkgname
@ -41,27 +53,6 @@ package() {
"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules "$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
} }
nonfree_firmware() {
pkgdesc="Firmware for Modem, WiFi, etc."
depends="
firmware-fairphone-fp4-adreno
firmware-fairphone-fp4-adsp
firmware-fairphone-fp4-bluetooth
firmware-fairphone-fp4-cdsp
firmware-fairphone-fp4-ipa
firmware-fairphone-fp4-modem
firmware-fairphone-fp4-wlan
firmware-qcom-adreno-a630
linux-firmware-ath10k
msm-modem
msm-modem-uim-selection
pd-mapper
tqftpserv
"
install="$subpkgname.post-install"
mkdir "$subpkgdir"
}
sha512sums=" sha512sums="
2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b 90-feedbackd-aw8695.rules 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b 90-feedbackd-aw8695.rules
9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a deviceinfo 9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a deviceinfo

View file

@ -1,3 +0,0 @@
#!/bin/sh
rc-update add tqftpserv boot
rc-update add pd-mapper boot

View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
rc-update add pd-mapper boot
rc-update add qbootctl default rc-update add qbootctl default
rc-update add tqftpserv boot