From e547b2c85ff9e89b54bc1f97f91da46bd76ed0d2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 4 Feb 2020 07:06:04 -0800 Subject: kbd: avoid vlock conflict with busybox busybox as well as vlock utility from meta-oe provides vlock utility which can conflict when with kbd if pam is a enabled distro_feature Fixes image build errors update-alternatives: Error: not linking /usr/bin/vlock to /bin/busybox.suid since /usr/bin/vlock exists and is not a link ERROR: yoe-qt5-wayland-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget_${PN} (). Deferring to first boot via 'exit 1' is no longer supported. (From OE-Core rev: d00349526f5727fdff9b40c6139d95bd75af213d) Signed-off-by: Khem Raj The vlock doesn't exist if PAM isn't enabled. Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie Signed-off-by: De Huo Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/kbd/kbd_2.0.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 17ce6e7a9c..47e76da2b4 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb @@ -59,7 +59,8 @@ RDEPENDS_${PN}-ptest = "make" inherit update-alternatives -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf