device/testing/device-realme-x3/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-realme-x3
 pkgdesc="Realme X3"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -17,6 +17,8 @@ depends="
 	swclock-offset
 "
 makedepends="devicepkg-dev"
+
+_ucm_commit="53f3949f794fd6e0ca816c8ed82cdf2d254645cf"
 source="
 	alsa-ucm-conf/HiFi.conf
 	alsa-ucm-conf/x3.conf
@@ -28,8 +30,6 @@ source="
 
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-alsa_ucm_conf
-	$pkgname-wireplumber
 "
 
 build() {
@@ -38,6 +38,16 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	# device-specific alsa-ucm-conf
+	install -Dm644 "$srcdir/HiFi.conf" \
+		"$pkgdir/usr/share/alsa/ucm2/Realme/x3/HiFi.conf"
+
+	install -Dm644 "$srcdir/x3.conf" \
+		"$pkgdir/usr/share/alsa/ucm2/conf.d/sdm845/Realme X3.conf"
+
+	install -Dm644 "$srcdir/51-qcom-sm8150.lua" \
+		-t "$pkgdir/usr/share/wireplumber/wireplumber.conf.d"
 }
 
 nonfree_firmware() {
@@ -59,23 +69,6 @@ nonfree_firmware() {
 		 "$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
 }
 
-alsa_ucm_conf() {
-	install -Dm644 "$srcdir/HiFi.conf" \
-		"$subpkgdir/usr/share/alsa/ucm2/Realme/x3/HiFi.conf"
-
-	install -Dm644 "$srcdir/x3.conf" \
-		"$subpkgdir/usr/share/alsa/ucm2/Realme/x3/x3.conf"
-
-	mkdir -p "$subpkgdir/usr/share/alsa/ucm2/conf.d/sdm845"
-	ln -s ../../Realme/x3/x3.conf \
-		"$subpkgdir/usr/share/alsa/ucm2/conf.d/sdm845/Realme X3.conf"
-}
-
-wireplumber() {
-	install -Dm644 "$srcdir/51-qcom-sm8150.lua" \
-		-t "$subpkgdir/usr/share/wireplumber/main.lua.d"
-}
-
 sha512sums="
 da5509da4b7f0dbf5e2c95375b334a750cef620f8ea77c17c8dde611134bdf474b4e10723f6d656b42843a727e395d352dd0578f1317fcbdf623f4533273fb49  HiFi.conf
 28d8dadac648f007d6e554684200bb1c0fb699a472e8459802691bbbadd67458626969d3d418ae145b94bedb3e83d73e8403206c0b4b509a6d3c541b6b733a7a  x3.conf