From 00e65093727f4345cddcd591a9352d20edba4de4 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@postmarketos.org>
Date: Mon, 9 Jun 2025 16:03:42 +0200
Subject: [PATCH] device-cutiepi-tablet: use new var
 deviceinfo_generate_cmdline_txt

It lets us move the variables in cmdline.txt to
deviceinfo_kernel_cmdline. We can thereafter drop the cmdline.txt file
entirely.

By setting deviceinfo_generate_cmdline_txt we tell boot-deploy to
generate /boot/cmdline.txt from deviceinfo_kernel_cmdline. boot-deploy
can then also add information about partition UUIDs to the cmdline,
which helps postmarketos-initramfs find the correct partitions.

Part-of: https://gitlab.postmarketos.org/postmarketos/pmaports/-/merge_requests/6630
---
 device/testing/device-cutiepi-tablet/APKBUILD    | 9 +++------
 device/testing/device-cutiepi-tablet/cmdline.txt | 1 -
 device/testing/device-cutiepi-tablet/deviceinfo  | 2 ++
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 device/testing/device-cutiepi-tablet/cmdline.txt

diff --git a/device/testing/device-cutiepi-tablet/APKBUILD b/device/testing/device-cutiepi-tablet/APKBUILD
index 9a29b862f..55441410f 100644
--- a/device/testing/device-cutiepi-tablet/APKBUILD
+++ b/device/testing/device-cutiepi-tablet/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-cutiepi-tablet
 pkgdesc="CutiePi Tablet"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,7 +21,6 @@ source="
 	backlight.rules
 	config.txt
 	usercfg.txt
-	cmdline.txt
 	95-vchiq-permissions.rules
 	"
 
@@ -34,7 +33,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 "$srcdir"/config.txt "$pkgdir"/boot/config.txt
 	install -Dm644 "$srcdir"/usercfg.txt "$pkgdir"/boot/usercfg.txt
-	install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt
 	install -Dm644 "$srcdir"/mpu6050-i2c5.dtbo \
 		"$pkgdir"/boot/overlays/mpu6050-i2c5.dtbo
 	install -Dm644 "$srcdir"/95-vchiq-permissions.rules \
@@ -58,12 +56,11 @@ openrc() {
 }
 
 sha512sums="
-2ee0abff944ef734b18f919f6285e468b5a8171399ed55cad1c5f5b436a59f89b4e25e1e6a5f8cef3f9ca44832e23f66f8273756808078e791f28ab02abaa95e  deviceinfo
+adea3fb928b821420a8bdfa61ff3bab571c2a23706404d6a5e47fbda27131f7b03333487d1a7a8cf652b69eb5a80b78d62a2cf757a0aa192d07bd374cb1c36a3  deviceinfo
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
 afc9f83be2b4d089fa1e2c17f7fcfe7f5131233c5f3ff7bca1d95e080416088c5d2f65b7146021fca6eec492ad67961d1fb5ee58b02fb9ddfa7b5b2a586e238d  mpu6050-i2c5-overlay.dts
 9fbf1e8fcad332980b345b1a5eb0b92e752e6f5490027084f5d5713dc113ea20c71932a44ec5a0e077798fee99e52b8db13c8bb2cd263f4d39bfe9d27ca51b2d  backlight.rules
 26d14d996561ef29de965bdcd9e2ee93192e76c7ab08c805f71bab550d7c938248ca72c744c78f351791d3312751f60ed74b21ce3e16515ceff2a03e0f8e8c01  config.txt
 2d69cf6b05c3a97dde203fd2b174e7817ac85680f8f5adc607bdb0e888dde3e448a5e91848c899ad49fe5f777facba0050ffa25402e5babd1992958bcbd92fd8  usercfg.txt
-ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
 "
diff --git a/device/testing/device-cutiepi-tablet/cmdline.txt b/device/testing/device-cutiepi-tablet/cmdline.txt
deleted file mode 100644
index 7603d36f8..000000000
--- a/device/testing/device-cutiepi-tablet/cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1
diff --git a/device/testing/device-cutiepi-tablet/deviceinfo b/device/testing/device-cutiepi-tablet/deviceinfo
index 50f654a2f..d8105c462 100644
--- a/device/testing/device-cutiepi-tablet/deviceinfo
+++ b/device/testing/device-cutiepi-tablet/deviceinfo
@@ -19,3 +19,5 @@ deviceinfo_screen_height="720"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_boot_filesystem="fat16"
+deviceinfo_kernel_cmdline="modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1"
+deviceinfo_generate_cmdline_txt="true"