[v2] kbd: avoid vlock conflict with busybox when pam is enabled

Message ID 20191209182701.4120643-1-raj.khem@gmail.com
State New
Headers show
Series
  • [v2] kbd: avoid vlock conflict with busybox when pam is enabled
Related show

Commit Message

Khem Raj Dec. 9, 2019, 6:27 p.m.
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 <rootfs>/usr/bin/vlock to /bin/busybox.suid since <rootfs>/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.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
v2: Check for pam in distro feautres

 meta/recipes-core/kbd/kbd_2.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.24.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb
index 9556302ab5..5270508b36 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -62,6 +62,8 @@  RDEPENDS_${PN}-ptest = "make"
 inherit update-alternatives
 
 ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey"
+ALTERNATIVE_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', ' vlock', '', d)}"
+
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"