device/testing/firmware-fairphone-fp2: package venus firmware

We keep device-specific firmware in this directory and not in
/lib/firmware.

device/testing/firmware-asus-flo/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-asus-flo
 pkgver=0
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware for asus-flo"
 url="https://developers.google.com/android/drivers#flomob30x"
 arch="armv7"
@@ -33,7 +33,7 @@ package() {
 	_files="bcm2079x-b5_firmware.ncd bcm2079x-b5_pre_firmware.ncd"
 	for _i in $_files; do
 		install -Dm644 "vendor/broadcom/flo/proprietary/$_i" \
-			"$pkgdir/lib/firmware/$_i";
+			"$pkgdir/lib/firmware/postmarketos/$_i";
 	done
 
 	# keymaster
@@ -41,7 +41,7 @@ package() {
 		keymaster.mdt"
 	for _i in $_files; do
 		install -Dm644 "vendor/qcom/flo/proprietary/$_i" \
-			"$pkgdir/lib/firmware/keymaster/$_i";
+			"$pkgdir/lib/firmware/postmarketos/keymaster/$_i";
 	done
 
 	# discretix
@@ -49,15 +49,15 @@ package() {
 		dxhdcp2.mdt"
 	for _i in $_files; do
 		install -Dm644 "vendor/qcom/flo/proprietary/$_i" \
-			"$pkgdir/lib/firmware/discretix/$_i";
+			"$pkgdir/lib/firmware/postmarketos/discretix/$_i";
 	done
 
 	# prima
 	install -Dm644 "$pkgname-$_commit_other-WCNSS_qcom_wlan_nv_flo.bin" \
-		"$pkgdir/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin"
+		"$pkgdir/lib/firmware/postmarketos/wlan/prima/WCNSS_qcom_wlan_nv.bin"
 	for _i in WCNSS_qcom_cfg.ini WCNSS_cfg.dat; do
 		install -Dm644 "$pkgname-$_commit_other-$_i" \
-			"$pkgdir/lib/firmware/wlan/prima/$_i";
+			"$pkgdir/lib/firmware/postmarketos/wlan/prima/$_i";
 	done
 
 	# qualcomm
@@ -71,7 +71,7 @@ package() {
 		vidc.mdt"
 	for _i in $_files; do
 		install -Dm644 "vendor/qcom/flo/proprietary/$_i" \
-			"$pkgdir/lib/firmware/$_i";
+			"$pkgdir/lib/firmware/postmarketos/$_i";
 	done
 }
 sha512sums="e18fe860185e2efe2b9b0d1ed17e7ba40c687fdf08667db1358fb8c68cc8632f36942ddccee975eecbc9f0e0a9b5b97abddb837dbd07653298609de09fe5bfce  broadcom-flo-mob30x-23c0a6c8.tgz

device/testing/firmware-asus-z00t/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-asus-z00t
 pkgver=0
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for asus-z00t"
 url="https://github.com/F2F056C4-B868-4F9D-BF2A-45B9CD317E1D/asus-z00t-firmware"
 arch="aarch64"
@@ -20,7 +20,7 @@ package() {
 	cd "$srcdir"
 
 	for part in b00 b01 b02 b03 mdt; do
-		install -Dm644 "$_dir/firmware/image/keymaste.$part" "$pkgdir/lib/firmware/keymaster/keymaster.$part";
+		install -Dm644 "$_dir/firmware/image/keymaste.$part" "$pkgdir/lib/firmware/postmarketos/keymaster/keymaster.$part";
 	done
 
 	# prima
@@ -38,14 +38,14 @@ package() {
 	"
 	for f in $_files; do
 		install -Dm644 "$_dir/etc-firmware/wlan/prima/$f" \
-			"$pkgdir/lib/firmware/wlan/prima/$f"
+			"$pkgdir/lib/firmware/postmarketos/wlan/prima/$f"
 	done
 	_files="
 		WCNSS_qcom_cfg.ini
 	"
 	for f in $_files; do
 		install -Dm644 "$f" \
-			"$pkgdir/lib/firmware/wlan/prima/$f"
+			"$pkgdir/lib/firmware/postmarketos/wlan/prima/$f"
 	done
 
 	# qualcomm
@@ -116,7 +116,7 @@ package() {
 	"
 	for f in $_files; do
 		install -Dm644 "$_dir/firmware/image/$f" \
-			"$pkgdir/lib/firmware/$f"
+			"$pkgdir/lib/firmware/postmarketos/$f"
 	done
 }
 sha512sums="f6011a1b0f367eba1e03fa38ef3eba35340492934e9160d37bb1211b05025c39f27e1991a6df32b8a3de4f1c9463bf27846998de46d84e1a2f2c97cda321d4e7  firmware-asus-z00t-d75a9d565250429ed5b06ed6c5d6f50cfadf9cb9.tar.gz

device/testing/firmware-fairphone-fp2/APKBUILD

@@ -1,40 +1,28 @@
 pkgname=firmware-fairphone-fp2
-pkgver=17.09.3
-pkgrel=3
+pkgver=18.04.1
+pkgrel=0
 pkgdesc="Firmware for Fairphone 2"
-subpackages="$pkgname-wcnss $pkgname-adsp $pkgname-modem"
+subpackages="$pkgname-adsp $pkgname-modem $pkgname-venus $pkgname-wcnss"
 url="https://github.com/FairBlobs/FP2-firmware"
 arch="armv7"
 license="proprietary"
 options="!check !strip !archcheck"
-builddir="$srcdir/FP2-firmware-$pkgver"
 
 # Sources
-_commit="6785087409c73b046d11a5c88225d4177e172a1d"
+_fw_commit="06b1dd34b9520ae829201fbd0ca090e4a9ca30fb"
+_dev_commit="6785087409c73b046d11a5c88225d4177e172a1d"
 _wififiles="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin"
-source="$pkgname-$pkgver.tar.gz::https://github.com/FairBlobs/FP2-firmware/archive/$pkgver.tar.gz"
+source="$pkgname-$_fw_commit.tar.gz::https://github.com/FairBlobs/FP2-firmware/archive/$_fw_commit.tar.gz"
 for _i in $_wififiles; do
-	source="$source $pkgname-$_commit-$_i::https://raw.githubusercontent.com/LineageOS/android_device_fairphone_FP2/$_commit/wifi/$_i";
+	source="$source $pkgname-$_dev_commit-$_i::https://raw.githubusercontent.com/LineageOS/android_device_fairphone_FP2/$_dev_commit/wifi/$_i";
 done
+builddir="$srcdir/FP2-firmware-$_fw_commit"
 
 package() {
 	# parent package is empty
 	mkdir -p "$pkgdir"
 }
 
-wcnss() {
-	pkgdesc="Fairphone 2 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
-
-	cd "$builddir"
-	for _i in wcnss.*; do
-		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
-	done
-	for _i in $_wififiles; do
-		install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \
-			"$subpkgdir/lib/firmware/postmarketos/wlan/prima/$_i"
-	done
-}
-
 adsp() {
 	pkgdesc="Fairphone 2 adsp firmware"
 
@@ -53,7 +41,29 @@ modem() {
 	done
 }
 
-sha512sums="f4af05a78e58b6f178903823a2bc2d4198dcb37b3a543aaa9fda21683757f880440ca2b138f37f61aafaf197cfad7b729e27f37e26cbd965fb4a772b42a8a881  firmware-fairphone-fp2-17.09.3.tar.gz
+venus() {
+	pkgdesc="Fairphone 2 venus firmware"
+
+	cd "$builddir"
+	for _i in venus.*; do
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
+	done
+}
+
+wcnss() {
+	pkgdesc="Fairphone 2 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
+
+	cd "$builddir"
+	for _i in wcnss.*; do
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
+	done
+	for _i in $_wififiles; do
+		install -Dm644 "$srcdir/$pkgname-$_dev_commit-$_i" \
+			"$subpkgdir/lib/firmware/postmarketos/wlan/prima/$_i"
+	done
+}
+
+sha512sums="da3f7a793d3f36bca7a647cbbec69fc89c3ca7a948a3445368105687d68c8a8c811352641f2c90e81f19fa967694fa8cc1afb89fc69a7f8302344b846da7d38b  firmware-fairphone-fp2-06b1dd34b9520ae829201fbd0ca090e4a9ca30fb.tar.gz
 619df454e0dc65ab62894b7f328c015729e8261919032ee9096bb4f983ddd6f7b98dd14f593b4c6b75cf86c09f090a9cde7674f4c8197cda927a2ac47111cd2e  firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_cfg.dat
 50625167fd5d3de8b834327a518714299972de3bd3077cb10d4317fb8135b52eb2f0d89f696f48e0530ac8d7a20e76ad01e30ebabec405ef241dc8b1cd52d94c  firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_qcom_cfg.ini
 d29aaefa6e42bd4a2146b79ee0f0fb6698dae34978bf9bebee9cfa96795c0329be1f7e896cf707f121dab35872d4ce9540b3c79c43bdfd98c75c16d2d875ab3c  firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_qcom_wlan_nv.bin"

device/testing/firmware-lg-hammerhead/APKBUILD

@@ -1,9 +1,14 @@
 pkgname=firmware-lg-hammerhead
 pkgver=1
-pkgrel=2
+pkgrel=4
 _modem_commit="d0565ebb2033bbd267b8be698373f075c9a82cd5"
 pkgdesc="Firmware for LG hammerhead (Nexus 5)"
-subpackages="$pkgname-modem $pkgname-adsp $pkgname-bluetooth"
+subpackages="
+	$pkgname-adsp
+	$pkgname-bluetooth
+	$pkgname-modem
+	$pkgname-venus
+	"
 url="https://developers.google.com/android/drivers#hammerheadm4b30z"
 arch="armv7"
 license="proprietary"
@@ -32,7 +37,7 @@ modem() {
 
 	cd "$srcdir/hammerhead-modem-$_modem_commit/image"
 	for _i in *; do
-		install -Dm644 $_i "$subpkgdir"/lib/firmware/$_i
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
 	done
 }
 
@@ -41,14 +46,23 @@ adsp() {
 
 	cd "$srcdir/qcom/vendor/qcom/hammerhead/proprietary"
 	for _i in adsp.*; do
-		install -Dm644 $_i "$subpkgdir"/lib/firmware/$_i
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
+	done
+}
+
+venus() {
+	pkgdesc="LG Nexus 5 venus firmware"
+
+	cd "$srcdir/qcom/vendor/qcom/hammerhead/proprietary"
+	for _i in venus.*; do
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
 	done
 }
 
 bluetooth() {
 	pkgdesc="LG Nexus 5 Bluetooth firmware"
 
-	install -Dm644 "$srcdir/broadcom/vendor/broadcom/hammerhead/proprietary/bcm4335c0.hcd" "$subpkgdir"/lib/firmware/brcm/BCM4335C0.hcd
+	install -Dm644 "$srcdir/broadcom/vendor/broadcom/hammerhead/proprietary/bcm4335c0.hcd" "$subpkgdir"/lib/firmware/postmarketos/brcm/BCM4335C0.hcd
 }
 
 sha512sums="a63a0fad2c7e5920c8a30213e149c51a745cdb2b34c1b13772737d1da51cd712aa81d3e03de6f3397d0705e59d0130727979f2c1c6f529788e0fbc9bbcde6a8a  hammerhead-modem-d0565ebb2033bbd267b8be698373f075c9a82cd5.tar.gz

device/testing/firmware-motorola-def/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: ky0ko <ky0ko@disroot.org>
 pkgname=firmware-motorola-def
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Motorola One Hyper"
 url="https://github.com/goshhhy/motorola-def-firmware"
 arch="aarch64"
@@ -15,7 +15,7 @@ source="https://github.com/goshhhy/motorola-def-firmware/archive/$_commit.tar.gz
 package() {
 	cd "$srcdir/motorola-def-firmware-$_commit/files"
 	for _i in *; do
-		install -Dm644 $_i "$pkgdir"/lib/firmware/$_i
+		install -Dm644 $_i "$pkgdir"/lib/firmware/postmarketos/$_i
 	done
 }
 

device/testing/firmware-oneplus-oneplus3/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-oneplus-oneplus3
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for OnePlus 3/3T (metapackage)"
 url="https://gitlab.com/DrGitX/firmware-oneplus3"
 arch="aarch64"
@@ -89,24 +89,24 @@ unpack() {
 package() {
 	cd "$srcdir"
 	for _i in a530_pfp.fw a530_pm4.fw a530v3_gpmu.fw2; do
-		install -Dm644 $_i "$pkgdir/lib/firmware/qcom/$_i"
+		install -Dm644 $_i "$pkgdir/lib/firmware/postmarketos/qcom/$_i"
 	done
 }
 
 _install_fw() {
-	mkdir -p "$subpkgdir/lib/firmware/qcom"
+	mkdir -p "$subpkgdir/lib/firmware/postmarketos/qcom"
 
 	cd "$srcdir/$1"
 
 	for _i in adsp.* modem.* mba.* slpi.*; do
-		install -Dm644 $_i "$subpkgdir/lib/firmware/$_i"
+		install -Dm644 $_i "$subpkgdir/lib/firmware/postmarketos/$_i"
 	done
 
 	for _i in venus.*; do
-		install -Dm644 $_i "$subpkgdir/lib/firmware/qcom/venus-4.2/$_i"
+		install -Dm644 $_i "$subpkgdir/lib/firmware/postmarketos/qcom/venus-4.2/$_i"
 	done
 
-	install -Dm644 "$srcdir/a530_zap$2.elf" "$subpkgdir/lib/firmware/qcom/a530_zap.mdt"
+	install -Dm644 "$srcdir/a530_zap$2.elf" "$subpkgdir/lib/firmware/postmarketos/qcom/a530_zap.mdt"
 
 	install -Dm644 "$srcdir/20-adreno-gpu-firmware.files" \
 		"$pkgdir/etc/postmarketos-mkinitfs/files/20-adreno-gpu-firmware.files"

device/testing/firmware-oppo-find-7a/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-oppo-find-7a
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 _commit="412fbe0922125a4d5ff884626c3274a15bd36dff"
 _commit_android_image="68f5bc5447b781ecfd7712c32cac96041374a8be"
 _commit_oppo_fw="31144f275f8542c73c624c4920fc72b6b8b2a860"
@@ -31,32 +31,32 @@ build() {
 package() {
 	for _i in $_files1; do
 		install -Dm644 msm8974-common/proprietary/vendor/firmware/"$_i" \
-			"$pkgdir"/lib/firmware/"$_i"
+			"$pkgdir"/lib/firmware/postmarketos/"$_i"
 	done
 	for _i in $_files2; do
 		install -Dm644 find7/proprietary/vendor/firmware/"$_i" \
-			"$pkgdir"/lib/firmware/"$_i"
+			"$pkgdir"/lib/firmware/postmarketos/"$_i"
 	done
 
 	cd "$srcdir"/android_device_oppo_msm8974-common-"$_commit_android_image"
 	for _i in $_files3; do
 		install -Dm644 wifi/"$_i" \
-			"$pkgdir"/lib/firmware/wlan/prima/"$_i"
+			"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
 	done
 
 	cd "$srcdir"
 	for _i in $_files4; do
-		install -Dm644 "$_i" "$pkgdir"/lib/firmware/"$_i"
+		install -Dm644 "$_i" "$pkgdir"/lib/firmware/postmarketos/"$_i"
 	done
 
 
-	install -Dm644 keymaste.b00 "$pkgdir"/lib/firmware/keymaster/keymaster.b00
-	install -Dm644 keymaste.b01 "$pkgdir"/lib/firmware/keymaster/keymaster.b01
-	install -Dm644 keymaste.b02 "$pkgdir"/lib/firmware/keymaster/keymaster.b02
-	install -Dm644 keymaste.b03 "$pkgdir"/lib/firmware/keymaster/keymaster.b03
-	install -Dm644 keymaste.mdt "$pkgdir"/lib/firmware/keymaster/keymaster.mdt
+	install -Dm644 keymaste.b00 "$pkgdir"/lib/firmware/postmarketos/keymaster/keymaster.b00
+	install -Dm644 keymaste.b01 "$pkgdir"/lib/firmware/postmarketos/keymaster/keymaster.b01
+	install -Dm644 keymaste.b02 "$pkgdir"/lib/firmware/postmarketos/keymaster/keymaster.b02
+	install -Dm644 keymaste.b03 "$pkgdir"/lib/firmware/postmarketos/keymaster/keymaster.b03
+	install -Dm644 keymaste.mdt "$pkgdir"/lib/firmware/postmarketos/keymaster/keymaster.mdt
 
-	cd "$pkgdir"/lib/firmware
+	cd "$pkgdir"/lib/firmware/postmarketos
 	ln -s . qcom
 }