treewide: drop PMOS_NO_OUTPUT_REDIRECT (MR 5240)
This cmdline argument is now a no-op. Drop it everywhere and add a new CI check to enforce this. Adjust the deprecated "minimal" initramfs variant to use pmos.debug-shell to enable logging instead. It doesn't /support/ dropping to a shell, so the variable takes on a different meaning. But that's ok since it's at least more consistent. [ci:ignore-count] [ci:skip-vercheck] Signed-off-by: Caleb Connolly <caleb@postmarketos.org> Tweaked-by: Oliver Smith <ollieparanoid@postmarketos.org> [ci:skip-build]: kernel builds are very likely to go through now
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
pkgname=devicepkg-dev
|
||||
pkgver=0.18.1
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="Provides default device package functions"
|
||||
url="https://postmarketos.org"
|
||||
arch="noarch"
|
||||
@@ -78,11 +78,11 @@ sha512sums="
|
||||
d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
|
||||
a483a970f6cf3e1f2724d8ec1039c2a935cc3e75efd016b3f134cef8a6e53820428bff0f1cb2bcfbd8ccda33c69fdb250be1cf061b2dc53c6063d2ab49023f97 devicepkg_build.sh
|
||||
5b83255dabd2019ea07a589d185bee5dad6760e28ab02de3480a0adfd1cf20d0c2e0b4a978e56757899ef683819091cee99d168a48e24a3f604b725e1ba26849 devicepkg_package.sh
|
||||
3b997a00e76be7d4540290275585026c5b83832c0b9a7214346763f03ec196b3f1bea9f50a9928a5cab0bc22dc557af136ffe146bd45d3666b5c05589891047d devicepkg_pmtest_post_install.sh
|
||||
93432976bb785c3ad23ba40ac80c11cb2fb0d83d73642ed39fa3f637a471d5d08641ccc42912d63139af49c521bb86bd02a613482bf8f5e95437aa000a125969 devicepkg_pmtest_post_install.sh
|
||||
f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6 downstreamkernel_prepare.sh
|
||||
107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh
|
||||
b9e64582d8c4ed35116002388b58ee62531b8db5de3f4629980ca5dcc9f39ba2c1c7c7a9caa03438e183afa42c8cc6680fe217304ef667b8bf213d93789226e9 devicepkg_subpackage_kernel.sh
|
||||
9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3 deviceinfo
|
||||
f09cb34626f2aedf9ffa69a8050500d54291c416f5e8c8d67ce72244e1d906b190d84a3fadccd7d82824b6a68d981ca8a197a053804df1103457ddb7892b2cc9 deviceinfo
|
||||
136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1 expected-deviceinfo-downstream
|
||||
8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097 expected-deviceinfo-mainline
|
||||
b2e87ab10c116adc18e89ebf478b08904b9a73b17176c03068f8711dac6353e6ab4b3fdaf4051eda05660cac31514520756973ec43d052ba9f42cb1ec9375c5d expected-deviceinfo-mainline
|
||||
"
|
||||
|
||||
@@ -19,5 +19,5 @@ cat <<EOF
|
||||
#!/bin/sh
|
||||
|
||||
echo -e "\n# PMOS CI: enable console logging" >> /etc/deviceinfo
|
||||
echo 'deviceinfo_kernel_cmdline_append="console=$console PMOS_NO_OUTPUT_REDIRECT"' >> /etc/deviceinfo
|
||||
echo 'deviceinfo_kernel_cmdline_append="console=$console"' >> /etc/deviceinfo
|
||||
EOF
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
deviceinfo_name="Test"
|
||||
deviceinfo_kernel_cmdline_downstream="androidboot.boot_recovery=1"
|
||||
deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
|
||||
deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200,n8"
|
||||
deviceinfo_kernel_cmdline_other="root=/dev/sda1 quiet splash"
|
||||
deviceinfo_bootimg_qcdt_downstream="true"
|
||||
deviceinfo_bootimg_qcdt_mainline="false"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
deviceinfo_name="Test"
|
||||
deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
|
||||
deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8"
|
||||
deviceinfo_bootimg_qcdt="false"
|
||||
|
||||
Reference in New Issue
Block a user