From f84cb52a7f005820873db8d5c7dbeb8b40cadb69 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 19 Oct 2021 10:31:47 +0200 Subject: [PATCH] : use separate firmware packages (MR 2619) Rule C: Devices with secure boot but without venus on the firmware partition need: 1. GPU firmware (firmware-qcom-adreno-a300) 2. msm-firmware-loader (for wcnss, modem) 4. device-specific -wcnss-nv firmware 5. device-specific -venus firmware --- device/community/device-motorola-harpia/APKBUILD | 7 ++++--- device/community/device-wileyfox-crackling/APKBUILD | 7 ++++--- device/testing/device-alcatel-idol347/APKBUILD | 7 ++++--- device/testing/device-asus-z010d/APKBUILD | 7 ++++--- device/testing/device-motorola-osprey/APKBUILD | 9 +++++---- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD index 3c6484323..de84ec3df 100644 --- a/device/community/device-motorola-harpia/APKBUILD +++ b/device/community/device-motorola-harpia/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Minecrell pkgname=device-motorola-harpia pkgdesc="Motorola Moto G4 Play" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -40,8 +40,9 @@ kernel_mainline_modem() { } nonfree_firmware() { - pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware" - depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus" + pkgdesc="GPU/WiFi/BT/Modem/Video firmware" + depends="firmware-qcom-adreno-a300 msm-firmware-loader + firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus" mkdir "$subpkgdir" } diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD index d2099a0ff..afac2e1c7 100644 --- a/device/community/device-wileyfox-crackling/APKBUILD +++ b/device/community/device-wileyfox-crackling/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Minecrell pkgname=device-wileyfox-crackling pkgdesc="Wileyfox Swift" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -39,8 +39,9 @@ kernel_mainline_modem() { } nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware" - depends="linux-firmware-qcom msm-firmware-loader firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus" + pkgdesc="GPU/WiFi/BT/Modem/Video firmware" + depends="firmware-qcom-adreno-a300 msm-firmware-loader + firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus" mkdir "$subpkgdir" } diff --git a/device/testing/device-alcatel-idol347/APKBUILD b/device/testing/device-alcatel-idol347/APKBUILD index 2b6b088d9..fc66d9348 100644 --- a/device/testing/device-alcatel-idol347/APKBUILD +++ b/device/testing/device-alcatel-idol347/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Vincent Knecht pkgname=device-alcatel-idol347 pkgdesc="Alcatel OneTouch Idol 3 (4.7)" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -40,8 +40,9 @@ kernel_mainline_modem() { } nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video firmware" - depends="linux-firmware-qcom msm-firmware-loader firmware-alcatel-idol347-wcnss-nv firmware-alcatel-idol347-venus" + pkgdesc="GPU/WiFi/BT/Modem/Video firmware" + depends="firmware-qcom-adreno-a300 msm-firmware-loader + firmware-alcatel-idol347-wcnss-nv firmware-alcatel-idol347-venus" mkdir "$subpkgdir" } diff --git a/device/testing/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD index 4638b663b..b9e0ee51d 100644 --- a/device/testing/device-asus-z010d/APKBUILD +++ b/device/testing/device-asus-z010d/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-asus-z010d pkgdesc="Asus Zenfone Max ZC550KL" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -37,8 +37,9 @@ kernel_mainline_modem() { } nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware" - depends="linux-firmware-qcom msm-firmware-loader firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus" + pkgdesc="GPU/WiFi/BT/Modem/Video firmware" + depends="firmware-qcom-adreno-a300 msm-firmware-loader + firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus" mkdir "$subpkgdir" } diff --git a/device/testing/device-motorola-osprey/APKBUILD b/device/testing/device-motorola-osprey/APKBUILD index 4ffe8722c..37d4a1d8e 100644 --- a/device/testing/device-motorola-osprey/APKBUILD +++ b/device/testing/device-motorola-osprey/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-motorola-osprey -pkgver=3 -pkgrel=1 +pkgver=4 +pkgrel=0 pkgdesc="Motorola Moto G 3rd gen. (2015)" url="https://postmarketos.org" arch="aarch64" @@ -38,9 +38,10 @@ kernel_mainline_modem() { } nonfree_firmware() { - pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware" + pkgdesc="GPU/WiFi/BT/Modem/Video firmware" # osprey's wcnss-nv + venus firmware seems identical to harpia's :> - depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus" + depends="firmware-qcom-adreno-a300 msm-firmware-loader + firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus" mkdir "$subpkgdir" }