| Message ID | 20250213200212.1694055-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] systemd: if getty generator is disabled remove the generator, not the units | expand |
On Thu Feb 13, 2025 at 9:02 PM CET, Ross Burton via lists.openembedded.org wrote: > If the getty generator is disabled then it's neater to remove just the > generator tool instead of the unit files as the unit files are still > useful. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- Hi Ross, Sorry, but I believe one patch in this series is again triggering a strange behaviour on the autobuilder: QMP released QEMU at 02/14/25 09:37:43 and took 0.12 seconds from connect WARNING: core-image-full-cmdline-1.0-r0 do_testimage: Couldn't login into serial console as root using blank password WARNING: core-image-full-cmdline-1.0-r0 do_testimage: The output: root qemux86-64 login: <<< run_serial(): command timed out after 120 seconds without output >>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/26/builds/1003/steps/35/logs/stdio https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1019/steps/13/logs/stdio https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/1042/steps/13/logs/stdio https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/947/steps/13/logs/stdio Can you have a look at this please?
diff --git a/meta/recipes-core/systemd/systemd_257.1.bb b/meta/recipes-core/systemd/systemd_257.1.bb index cdf72a50157..b9f17849671 100644 --- a/meta/recipes-core/systemd/systemd_257.1.bb +++ b/meta/recipes-core/systemd/systemd_257.1.bb @@ -287,9 +287,11 @@ do_install() { fi fi install -d ${D}/${base_sbindir} - if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then - # Provided by a separate recipe - rm ${D}${systemd_system_unitdir}/serial-getty* -f + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'true', 'false', d)}; then + # Remove the serial-getty generator and instead use explicit services + # created by the systemd-serialgetty recipe + find ${D} -name \*getty-generator\* -delete fi # Provide support for initramfs
If the getty generator is disabled then it's neater to remove just the generator tool instead of the unit files as the unit files are still useful. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-core/systemd/systemd_257.1.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)