From b081d3a09d6dcf2129e3582d767a0dcc3614c5bc Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 12 Jan 2026 14:08:23 -0800 Subject: [PATCH] device-qemu-*: move kernel cmdline config to kernel-cmdline.d Signed-off-by: Clayton Craft Part-of: --- device/main/device-qemu-aarch64/APKBUILD | 6 ++++-- device/main/device-qemu-aarch64/deviceinfo | 1 - device/main/device-qemu-aarch64/kernel-cmdline.conf | 4 ++++ device/main/device-qemu-amd64/APKBUILD | 8 +++++--- device/main/device-qemu-amd64/deviceinfo | 1 - device/main/device-qemu-amd64/kernel-cmdline.conf | 4 ++++ device/main/device-qemu-loongarch64/APKBUILD | 8 +++++--- device/main/device-qemu-loongarch64/deviceinfo | 1 - device/main/device-qemu-loongarch64/kernel-cmdline.conf | 3 +++ device/main/device-qemu-ppc64le/APKBUILD | 8 +++++--- device/main/device-qemu-ppc64le/deviceinfo | 1 - device/main/device-qemu-ppc64le/kernel-cmdline.conf | 3 +++ device/main/device-qemu-riscv64/APKBUILD | 8 +++++--- device/main/device-qemu-riscv64/deviceinfo | 1 - device/main/device-qemu-riscv64/kernel-cmdline.conf | 4 ++++ 15 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 device/main/device-qemu-aarch64/kernel-cmdline.conf create mode 100644 device/main/device-qemu-amd64/kernel-cmdline.conf create mode 100644 device/main/device-qemu-loongarch64/kernel-cmdline.conf create mode 100644 device/main/device-qemu-ppc64le/kernel-cmdline.conf create mode 100644 device/main/device-qemu-riscv64/kernel-cmdline.conf diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index f4c474521..cd8f54c9f 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Achill Gilgenast maintainer="Oliver Smith " pkgname=device-qemu-aarch64 -pkgver=14 +pkgver=15 pkgrel=0 pkgdesc="Simulated device in QEMU (aarch64)" url="https://postmarketos.org" @@ -23,6 +23,7 @@ subpackages=" source=" deviceinfo + kernel-cmdline.conf " options="!check !archcheck" @@ -81,5 +82,6 @@ pmtest() { } sha512sums=" -47ec1ad6851e6025d02158bdf466491e6100b489dd3ff57b82774a6c3eb24504c6f5bc8381686edd36a7d6cceebfadc978a1da08cc93cb6d587a6bc0cfe488d8 deviceinfo +295b72c50f5900fde4075c3975affa863bc4334ec446b5a18021b3c4643bd0e6d1d6edcb61f17a56383f2e5ef38e2dc0935d560487b3987b8d0c883ba055bb91 deviceinfo +fb390f6dadd302f9747a305947a2002375fba56a7584206d30fd8fc723c10494786b49f9cc3fa14a3109ed140341dcd9cc6c2b8ccb4e011911b83a871eaa721d kernel-cmdline.conf " diff --git a/device/main/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo index c40dfca4d..a20ba9877 100644 --- a/device/main/device-qemu-aarch64/deviceinfo +++ b/device/main/device-qemu-aarch64/deviceinfo @@ -17,7 +17,6 @@ deviceinfo_screen_height="768" deviceinfo_getty="ttyAMA0;115200" # Bootloader related -deviceinfo_kernel_cmdline="console=tty1 console=ttyAMA0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true" deviceinfo_boot_filesystem="fat32" deviceinfo_generate_systemd_boot="true" diff --git a/device/main/device-qemu-aarch64/kernel-cmdline.conf b/device/main/device-qemu-aarch64/kernel-cmdline.conf new file mode 100644 index 000000000..ab7a461b7 --- /dev/null +++ b/device/main/device-qemu-aarch64/kernel-cmdline.conf @@ -0,0 +1,4 @@ +console=tty1 +console=ttyAMA0,115200 +pmos.force-partition-resize +psi=1 diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index aa699e867..66ee8df65 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -2,8 +2,8 @@ # Co-Maintainer: Achill Gilgenast maintainer="Oliver Smith " pkgname=device-qemu-amd64 -pkgver=15 -pkgrel=1 +pkgver=16 +pkgrel=0 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" arch="x86_64" @@ -24,6 +24,7 @@ subpackages=" " source=" deviceinfo + kernel-cmdline.conf " options="!check !archcheck" @@ -68,5 +69,6 @@ pmtest() { } sha512sums=" -4e6437e7e5a76b1e599b2497049fa2e92614c48c45b91b4310221615b2116c408c946143fb69cb5f93812363eb3829ace3d1dad09a4c5388504ab942fc1acd9a deviceinfo +879044487e1432f0af5cc34b5a7c46cfe09ab837592b1d2febf22db2e4da0747174b3dac6accfa5be21261e38e7eeb25d3f2477f5b78267f92d30e051b6671c4 deviceinfo +433875074bc225f5509bde089409b079902a5f161ecb22abcee25b2e45399b3561288c1018e5e08a6a21c38844f7b185dc3683442f97ceddee1020fdc6cc022b kernel-cmdline.conf " diff --git a/device/main/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo index c0944d710..ba441126e 100644 --- a/device/main/device-qemu-amd64/deviceinfo +++ b/device/main/device-qemu-amd64/deviceinfo @@ -19,7 +19,6 @@ deviceinfo_dev_internal_storage="/dev/vdb" deviceinfo_dev_internal_storage_repartition="true" # Bootloader related -deviceinfo_kernel_cmdline="console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true" deviceinfo_boot_filesystem="fat32" deviceinfo_generate_systemd_boot="true" diff --git a/device/main/device-qemu-amd64/kernel-cmdline.conf b/device/main/device-qemu-amd64/kernel-cmdline.conf new file mode 100644 index 000000000..ee7765745 --- /dev/null +++ b/device/main/device-qemu-amd64/kernel-cmdline.conf @@ -0,0 +1,4 @@ +console=tty1 +console=ttyS0,115200 +pmos.force-partition-resize +psi=1 diff --git a/device/main/device-qemu-loongarch64/APKBUILD b/device/main/device-qemu-loongarch64/APKBUILD index a8d20aa44..5dbdbd4d4 100644 --- a/device/main/device-qemu-loongarch64/APKBUILD +++ b/device/main/device-qemu-loongarch64/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Clayton Craft maintainer="Aelin " pkgname=device-qemu-loongarch64 -pkgver=4 -pkgrel=1 +pkgver=5 +pkgrel=0 pkgdesc="Simulated device in QEMU (loongarch64)" url="https://postmarketos.org" arch="loongarch64" @@ -22,6 +22,7 @@ subpackages=" source=" deviceinfo + kernel-cmdline.conf " options="!check !archcheck" @@ -46,5 +47,6 @@ kernel_stable() { } sha512sums=" -8827f46442d31d73ab1d15298705037222afa21588050c95c5684928ffd4446c6a0e1b886bee9d20200e7e4bf1ed7d59945b180c3f98ee7fcfa07cff99f06e6c deviceinfo +847303ea219eb4aba98e30c2ba9d43e0396b7f2d0029f42552ec40e36858014347e07749f80b14a92db1dc9b38730a591b56d03dcb40a04ced8af21843e0b860 deviceinfo +eb8f9fd9e4b58c7c2cd810ae6449e836d0fa095f6eaa2da661481df6eb40d452998613b3d032f0477f0ac32559689db48eb3da189495c16bd016b8eac3b67b16 kernel-cmdline.conf " diff --git a/device/main/device-qemu-loongarch64/deviceinfo b/device/main/device-qemu-loongarch64/deviceinfo index 1c0bb0532..7e4a8d4cc 100644 --- a/device/main/device-qemu-loongarch64/deviceinfo +++ b/device/main/device-qemu-loongarch64/deviceinfo @@ -18,6 +18,5 @@ deviceinfo_getty="ttyS0;115200" deviceinfo_disable_dhcpd="true" # Bootloader related -deviceinfo_kernel_cmdline="console=tty0 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE" deviceinfo_boot_filesystem="fat32" deviceinfo_generate_systemd_boot="true" diff --git a/device/main/device-qemu-loongarch64/kernel-cmdline.conf b/device/main/device-qemu-loongarch64/kernel-cmdline.conf new file mode 100644 index 000000000..19ce4e3d5 --- /dev/null +++ b/device/main/device-qemu-loongarch64/kernel-cmdline.conf @@ -0,0 +1,3 @@ +console=tty0 +console=ttyS0,115200 +pmos.force-partition-resize diff --git a/device/main/device-qemu-ppc64le/APKBUILD b/device/main/device-qemu-ppc64le/APKBUILD index bb1f718e9..2895746e4 100644 --- a/device/main/device-qemu-ppc64le/APKBUILD +++ b/device/main/device-qemu-ppc64le/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: famfo maintainer="Aelin " pkgname=device-qemu-ppc64le -pkgver=6 -pkgrel=1 +pkgver=7 +pkgrel=0 pkgdesc="Simulated device in QEMU (ppc64le)" url="https://postmarketos.org" arch="ppc64le" @@ -22,6 +22,7 @@ subpackages=" " source=" + kernel-cmdline.conf deviceinfo " options="!check !archcheck" @@ -53,5 +54,6 @@ kernel_stable() { } sha512sums=" -e27853254dcb297c219004498147b413a74163d4a00446e662255cfc5d4536e16abe0a8b24053c7ce6f65f48c90868c0fc02f05f14ce8e43a4645bfca4687429 deviceinfo +875267ce79b89ab77b7caa86f34bb942019ec0a5390a0f0a5156faa316367a59545b395a564875d2b2c48b83ebcb67c12b27895905301ac34410389333284ebd kernel-cmdline.conf +4e8d60fe172dfd392075ecf533e06ecfa42925355b242b112045915a1b3e51ac0880daa23f7750a4f480bd0fb2b7ebab77b6e28292ec4cba015653383cc1824a deviceinfo " diff --git a/device/main/device-qemu-ppc64le/deviceinfo b/device/main/device-qemu-ppc64le/deviceinfo index dbd6f2379..4a03e16eb 100644 --- a/device/main/device-qemu-ppc64le/deviceinfo +++ b/device/main/device-qemu-ppc64le/deviceinfo @@ -17,7 +17,6 @@ deviceinfo_screen_height="768" deviceinfo_getty="hvc0;38400" # Bootloader related -deviceinfo_kernel_cmdline="console=tty1 console=hvc0 PMOS_FORCE_PARTITION_RESIZE" deviceinfo_disable_dhcpd="true" deviceinfo_create_prep_boot="true" deviceinfo_generate_grub_config="true" diff --git a/device/main/device-qemu-ppc64le/kernel-cmdline.conf b/device/main/device-qemu-ppc64le/kernel-cmdline.conf new file mode 100644 index 000000000..cb659a82e --- /dev/null +++ b/device/main/device-qemu-ppc64le/kernel-cmdline.conf @@ -0,0 +1,3 @@ +console=tty1 +console=hvc0 +pmos.force-partition-resize diff --git a/device/main/device-qemu-riscv64/APKBUILD b/device/main/device-qemu-riscv64/APKBUILD index c39c66c1f..9395562b0 100644 --- a/device/main/device-qemu-riscv64/APKBUILD +++ b/device/main/device-qemu-riscv64/APKBUILD @@ -2,8 +2,8 @@ # Co-Maintainer: Achill Gilgenast maintainer="Luca Weiss " pkgname=device-qemu-riscv64 -pkgver=9 -pkgrel=1 +pkgver=10 +pkgrel=0 pkgdesc="Simulated device in QEMU (riscv64)" url="https://postmarketos.org" arch="riscv64" @@ -18,6 +18,7 @@ subpackages=" " source=" + kernel-cmdline.conf deviceinfo " options="!check !archcheck" @@ -39,5 +40,6 @@ kernel_stable() { } sha512sums=" -0f6c30def83bfdfea7da0a9786f28e81bfbca9a51f224f206b13a36f659faac82ca5192cc3663f493a7a18ad788c2ee7cca51ca1ad61efd2966e405aad0dc036 deviceinfo +8411587834a64f96673e890195d7e6d7451e0316a69126197a4d6a1522e36c7c5a8a522647f1712038653803d19cf27916a66c6f0e409bd41ddca19f6ff1cda9 kernel-cmdline.conf +78d0252f49f4b0f527a2f6c726abe32cd112553fdcd5793070999dfeb331c4d94fbc63ca163ea282f439f0f069cdbeea5051d9e9aeb8831a3862076b04357c5e deviceinfo " diff --git a/device/main/device-qemu-riscv64/deviceinfo b/device/main/device-qemu-riscv64/deviceinfo index 05d90c7fc..502dae044 100644 --- a/device/main/device-qemu-riscv64/deviceinfo +++ b/device/main/device-qemu-riscv64/deviceinfo @@ -17,5 +17,4 @@ deviceinfo_screen_height="768" deviceinfo_getty="ttyS0;230400" # Bootloader related -deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true" diff --git a/device/main/device-qemu-riscv64/kernel-cmdline.conf b/device/main/device-qemu-riscv64/kernel-cmdline.conf new file mode 100644 index 000000000..6ba119c45 --- /dev/null +++ b/device/main/device-qemu-riscv64/kernel-cmdline.conf @@ -0,0 +1,4 @@ +console=tty1 +console=ttyS0 +pmos.force-partition-resize +psi=1