From 8ff2b343a37fcafb88ab9cec0d1aa0a71d8ecd12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Wed, 27 Mar 2024 20:58:16 +0100
Subject: [PATCH] device-xiaomi-onclite: remove nonfree-firmware subpackage (MR
 4970)

Remove nonfree-firmware subpackage and depend on firmware-qcom-adreno-a530.
---
 device/testing/device-xiaomi-onclite/APKBUILD | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/device/testing/device-xiaomi-onclite/APKBUILD b/device/testing/device-xiaomi-onclite/APKBUILD
index d06c1ab3d..8887f9919 100644
--- a/device/testing/device-xiaomi-onclite/APKBUILD
+++ b/device/testing/device-xiaomi-onclite/APKBUILD
@@ -4,21 +4,25 @@
 pkgname=device-xiaomi-onclite
 pkgdesc="Xiaomi Redmi 7"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a530
+	firmware-xiaomi-onclite
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
+	soc-qcom-msm8953-initramfs
+	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,17 +32,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
-	depends="
-		firmware-xiaomi-onclite
-		msm-firmware-loader
-		soc-qcom-msm8953-initramfs
-		soc-qcom-msm8953-modem
-	"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 f034295150acd176b9e9afe1936778d977cc220a9980e2081df3de7aa6705b2b0e86eaacdc84290b204729d5e3b8c23da71c41fc8a972519a8a0aa4e41d3599d  deviceinfo
 706e76054992dfd03ef240e0de2d7e84a77c97727141fa8d737b02c9d780f60c2df57755e17c44d93136aa6a6d1f8a8d9dbbf51d11674e5fb67197bd313811fd  modules-initfs