From d7f8b31920d6b5caa1bafd55d409ef96f10834ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Tue, 14 May 2024 20:47:45 +0200
Subject: [PATCH] device-motorola-ali: remove non-free-firmware & add lk2nd and
 panels (MR 5132)

Add lk2nd-msm8953-motorola-ali as a dependency and panel drivers to initfs and
remove non-free-firmware subpackage.
---
 device/testing/device-motorola-ali/APKBUILD   | 25 ++++++++-----------
 .../device-motorola-ali/modules-initfs        |  4 ++-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/device/testing/device-motorola-ali/APKBUILD b/device/testing/device-motorola-ali/APKBUILD
index c030e5a1b..f61e7b688 100644
--- a/device/testing/device-motorola-ali/APKBUILD
+++ b/device/testing/device-motorola-ali/APKBUILD
@@ -1,20 +1,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-ali
 pkgdesc="Motorola Moto G6"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-msm8953 mkbootimg"
+depends="
+	firmware-motorola-ali
+	firmware-qcom-adreno-a530
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953-motorola-ali
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
 
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -23,14 +27,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/Wi-Fi/Bluetooth/Audio/Video/Modem firmware"
-	depends="firmware-motorola-ali msm-firmware-loader"
-	mkdir "$subpkgdir"
-}
-
-
 sha512sums="
 3d4c2cbf443c03de418cc4d072b84053d64d324bc8b2c5a88c88b137fccc647c676f7a2e33bbf8d403dc1b6f6fa8e4d3b22aa0200f3d5680fc426b0f7e4c321b  deviceinfo
-43b1376323cdc7d3cd626731f940679af0de27d7bdba92dfc6a9b0fc1a8fe59b6917f94f524061c1c7ca127ce5019da1a77c40cc4aeb89fa545e61e4adc4c142  modules-initfs
+097ac4b7c82a984d3e71309b015ba161ab5d851cc3a7bac11afced39d762112d1ad1df64a26c9128a4d3f8338ecbd75820170f873ac28a4684c2d6b83562a8a7  modules-initfs
 "
diff --git a/device/testing/device-motorola-ali/modules-initfs b/device/testing/device-motorola-ali/modules-initfs
index 54b04ca86..a3a1672b2 100644
--- a/device/testing/device-motorola-ali/modules-initfs
+++ b/device/testing/device-motorola-ali/modules-initfs
@@ -1,2 +1,4 @@
-msm
 edt_ft5x06
+msm
+panel-motorola-ali-boe
+panel-motorola-ali-tianma