device-xiaomi-nabu: replace device specific kernel in favor of generic sm8150 kernel (MR 6224)

device/testing/device-xiaomi-nabu/APKBUILD

@@ -1,14 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Pan Ortiz <panjeoc@proton.me>
 pkgname=device-xiaomi-nabu
 pkgdesc="Xiaomi Pad 5"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check	!archcheck"
 depends="
-	linux-postmarketos-qcom-sm8150-nabu
+	linux-postmarketos-qcom-sm8150
 	hexagonrpcd>=0.3.2-r3
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
@@ -50,7 +51,7 @@ package() {
 mainline_firmware() {
 	pkgdesc="Firmware support packages for mainline kernel"
 	depends="firmware-xiaomi-nabu-adreno"
-	install_if="linux-postmarketos-qcom-sm8150-nabu $pkgname-nonfree-firmware"
+	install_if="linux-postmarketos-qcom-sm8150 $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 	install -Dm64 "$srcdir/30-gpu-firmware.files" \
 		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
@@ -89,7 +90,7 @@ nonfree_firmware_openrc() {
 alsa() {
 	pkgdesc="Audio configuration files"
 	depends="alsa-ucm-conf"
-	install_if="linux-postmarketos-qcom-sm8150-nabu $pkgname-nonfree-firmware"
+	install_if="linux-postmarketos-qcom-sm8150 $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 	install	-Dm644 "$srcdir/XiaomiPad5.conf" "$subpkgdir/usr/share/alsa/ucm2/conf.d/sm8150/Xiaomi Pad 5.conf"
 	install	-Dm644 "$srcdir/HiFi.conf" "$subpkgdir/usr/share/alsa/ucm2/Xiaomi/nabu/HiFi.conf"
@@ -98,7 +99,7 @@ alsa() {
 pulseaudio() {
 	pkgdesc="Pulseaudio configuration files"
 	depends="pulseaudio"
-	install_if="linux-postmarketos-qcom-sm8150-nabu $pkgname-nonfree-firmware"
+	install_if="linux-postmarketos-qcom-sm8150 $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 	install -Dm644 "$srcdir/pulse-xiaomi_nabu.conf" "$subpkgdir/etc/pulse/daemon.conf.d/89-xiaomi_nabu.conf"
 	install -Dm644 "$srcdir/nabu.pa" "$subpkgdir/etc/pulse/default.pa.d/nabu.pa"

device/testing/linux-postmarketos-qcom-sm8150-nabu/APKBUILD

@@ -1,66 +0,0 @@
-_flavor="postmarketos-qcom-sm8150-nabu"
-pkgname=linux-$_flavor
-pkgver=6.12.0
-pkgrel=1
-pkgdesc="Mainline Kernel fork for SM8150 devices"
-arch="aarch64"
-_carch="arm64"
-url="https://gitlab.postmarketos.org/panpanpanpan/sm8150-mainline"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps
-	pmb:cross-native
-	pmb:kconfigcheck-nftables
-	"
-makedepends="
-	postmarketos-installkernel
-	bash
-	bison
-	findutils
-	flex
-	installkernel
-	openssl-dev
-	perl
-	python3
-	"
-
-_repo="sm8150-mainline"
-_config="config-$_flavor.$arch"
-_commit="c4e7de505964a69e2757523fd25343a2bf832b98"
-
-# Source
-source="
-	$_repo-$_commit.tar.gz::https://gitlab.postmarketos.org/panpanpanpan/sm8150-mainline/-/archive/$_commit/$_repo.tar.gz
-	$_config
-"
-builddir="$srcdir/$_repo-$_commit"
-
-prepare() {
-	default_prepare
-	cp "$srcdir/config-$_flavor.$arch" .config
-}
-
-build()	{
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel+ 1 ))-$_flavor"
-}
-
-package() {
-	mkdir -p "$pkgdir"/boot
-
-	make zinstall modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_PATH="$pkgdir"/boot/ \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
-	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
-}
-
-sha512sums="
-6f1ffea0322415b3e6a0176ad6a16a4accb7c611581ffc2bb772ddfdc04af677a5b5f955d19b29f7baf1c6a9b7297273f55c818cec981b2b8960c781dbb8bb56  sm8150-mainline-c4e7de505964a69e2757523fd25343a2bf832b98.tar.gz
-92006d83db7bc3fc0a6fc818fcd01ad7e021514b3b12e255a1676cd1374210b8472ebc6301b0a6a38601a138605e0135ccf7f44af5c43c43a2c2d5cf3f7ee0ab  config-postmarketos-qcom-sm8150-nabu.aarch64
-"