From b5a4d3282d81ee3e812df2b49ec99293d9b7cf1a Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Tue, 20 Aug 2024 12:55:25 +0800
Subject: [PATCH] device-xiaomi-raphael: add nonfree firmware depends (MR 5518)

Signed-off-by: dabao1955 <dabao1955@163.com>
---
 device/testing/device-xiaomi-raphael/APKBUILD | 34 +++++++++++++++----
 ...omi-raphael-nonfree-firmware.post-install} |  0
 .../device-xiaomi-raphael.post-install        |  2 --
 .../testing/firmware-xiaomi-raphael/APKBUILD  |  8 ++---
 4 files changed, 32 insertions(+), 12 deletions(-)
 rename device/testing/{firmware-xiaomi-raphael/firmware-xiaomi-raphael.post-install => device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware.post-install} (100%)
 delete mode 100644 device/testing/device-xiaomi-raphael/device-xiaomi-raphael.post-install

diff --git a/device/testing/device-xiaomi-raphael/APKBUILD b/device/testing/device-xiaomi-raphael/APKBUILD
index d1b7d1335..d05ae2dd3 100644
--- a/device/testing/device-xiaomi-raphael/APKBUILD
+++ b/device/testing/device-xiaomi-raphael/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-raphael
 pkgdesc="Xiaomi Mi 9T Pro / Redmi K20 Pro"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,9 +10,7 @@ _carch="arm64"
 options="!check !archcheck"
 depends="
 	linux-xiaomi-raphael
-	firmware-xiaomi-raphael
 	mkbootimg
-	linux-firmware-qcom
 	postmarketos-base
 	mesa-vulkan-freedreno
 "
@@ -20,7 +18,10 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	device-xiaomi-raphael.post-install
+"
+
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
 "
 
 build() {
@@ -31,7 +32,28 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Firmware for GPU, WiFi, etc."
+	depends="
+		firmware-xiaomi-raphael
+		firmware-xiaomi-raphael-adreno
+		firmware-xiaomi-raphael-adsp
+		firmware-xiaomi-raphael-camera
+		firmware-xiaomi-raphael-cdsp
+		firmware-xiaomi-raphael-ipa
+		firmware-xiaomi-raphael-slpi
+		firmware-xiaomi-raphael-touchscreen
+		firmware-xiaomi-raphael-venus
+		linux-firmware-ath11k
+		linux-firmware-qcom
+		msm-modem
+		pd-mapper
+		tqftpserv
+"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 0fa2589c24be704a65380373099e540b61df185f1da77c024b104dc1664e40925200511074d180101b6163a604803baa4a407059dae7cb1c1a700890abbbb939  deviceinfo
-d81350bb2c594d1c922b4eaa5f7ddd94ff5c52d915b6b34e01be2fddc5d624dea77343fab9b168acf889b55daa80a5deace6b81366d579816d5cc73b543a6826  modules-initfs
-0101125027c146dbcc357cae9c4dfcbc5b8ce91293a0e8289954157f76fb17bc7dde801c393fdbf31cbcf30158f98ed891795baf7ebe1d78034f92dba8bcb946  device-xiaomi-raphael.post-install"
+d81350bb2c594d1c922b4eaa5f7ddd94ff5c52d915b6b34e01be2fddc5d624dea77343fab9b168acf889b55daa80a5deace6b81366d579816d5cc73b543a6826  modules-initfs"
diff --git a/device/testing/firmware-xiaomi-raphael/firmware-xiaomi-raphael.post-install b/device/testing/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware.post-install
similarity index 100%
rename from device/testing/firmware-xiaomi-raphael/firmware-xiaomi-raphael.post-install
rename to device/testing/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware.post-install
diff --git a/device/testing/device-xiaomi-raphael/device-xiaomi-raphael.post-install b/device/testing/device-xiaomi-raphael/device-xiaomi-raphael.post-install
deleted file mode 100644
index 1ce77a594..000000000
--- a/device/testing/device-xiaomi-raphael/device-xiaomi-raphael.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update add qbootctl default
diff --git a/device/testing/firmware-xiaomi-raphael/APKBUILD b/device/testing/firmware-xiaomi-raphael/APKBUILD
index d9b2998aa..8083e87d6 100644
--- a/device/testing/firmware-xiaomi-raphael/APKBUILD
+++ b/device/testing/firmware-xiaomi-raphael/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-xiaomi-raphael
-pkgver=20240117
-pkgrel=0
+pkgver=20240820
+pkgrel=1
 pkgdesc="Firmware for Xiaomi Mi 9T Pro / Redmi K20 Pro"
 arch="aarch64"
 _carch="arm64"
@@ -22,13 +22,14 @@ _commit="45b6e993cf5d6fec447d924cf773783a8dbfb596"
 source="
 	https://github.com/dabao1955/pmos_firmware_xiaomi_raphael/archive/$_commit.tar.gz
 	30-gpu-firmware.files
-	firmware-xiaomi-raphael.post-install
 	"
 builddir="$srcdir/pmos_firmware_xiaomi_raphael-$_commit"
 
 package() {
 	# parent package is empty
 	mkdir -p "$pkgdir"
+	install -Dm644 "$srcdir/30-gpu-firmware.files" \
+		"$pkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
 }
 
 # Xiaomi raphael boots with secure boot, it can only load signed firmwares.
@@ -98,5 +99,4 @@ venus() {
 sha512sums="
 6e1b7d49846fa9834ccd8ee3bb64751c844bdfff52a4501a048f9055e59afb1f31b69bd5b2cd8296d86b89064c86cabb9c7e9dc9db9cd9fb43db9e4b4b478a39 45b6e993cf5d6fec447d924cf773783a8dbfb596.tar.gz
 c4e4a36dc0fd52569dec9f18c09849862d864fbbe56b044f22ce0d5c1ceb4380d08645c894a86f0668250fe48e5eef6a5f1f5147200efd918e4a340547ca084e  30-gpu-firmware.files
-5abdf51e4c7ce188f0bd7ccd9741dbd472ec1469e2f7b5074dde97a8f4171c3bb117cf838615c0f1870f5d89708aa6541fde097e47020c8bbacde5e00f1cca97  firmware-xiaomi-raphael.post-install
 "