xiaomi-vince: use msm8953 prefix for dtb filename and remove mainline subpackage (MR 4023)

device/testing/device-xiaomi-vince/APKBUILD

@@ -2,25 +2,29 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg"
+depends="
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-modem
-	"
+"
 source="
 	30-gpu-firmware.files
 	deviceinfo
 	fb.modes
 	pointercal
-	"
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -39,12 +43,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel, plenty of working features and fixes"
-	depends="linux-postmarketos-qcom-msm8953 lk2nd-msm8953"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 modem() {
 	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
 	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
@@ -53,7 +51,7 @@ modem() {
 
 sha512sums="
 0e8ee21fb65fa2d2f6b27e8d8e18ac8d0347d134002de3bd2fc8262b255edc55f3e2f976daf0a362f418e9213962616fecb90b40576effd1d5d5d09d2a45564d  30-gpu-firmware.files
-406b3e9cc75cbc054381e80c89cbb0fa2e4518e29d8d9254fbf9014ece829ec72a591da186fb622f1944d4f45e79b2c26468c016f9dca605ad1981668522323a  deviceinfo
+8b46e915d545defa1ed109f0ca6bdeee595225a30d9b009e3703e4726508cbc175231a7f36dfcd8c88d830c7ad6dd30a90248bcc3c1a1920f54cf23e9ab7eec2  deviceinfo
 9b888f3a4ef3ed3c0b2e9c6a6e8a6c686909c530c3d95be797b47b4eb9deb55d64190b7a3736e44139630bfff5e295625a855052923369fdd37889060a3220ca  fb.modes
 4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975  pointercal
 "

device/testing/device-xiaomi-vince/deviceinfo

@@ -10,8 +10,8 @@ deviceinfo_year="2017"
 deviceinfo_arch="aarch64"
 
 # Mainline
-deviceinfo_dtb_mainline="qcom/sdm625-xiaomi-vince"
-deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb="qcom/msm8953-xiaomi-vince"
+deviceinfo_append_dtb="true"
 deviceinfo_gpu_accelerated="true"
 
 # Device related
@@ -26,7 +26,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"