summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-12-14 11:59:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-15 09:10:46 +0000
commitc26566e44ba2e01111674d74a1c590ef6c5baa02 (patch)
tree5a53b5f7068aee8cc207c6a804b9a24ebab8d622 /meta/recipes-core
parente3d5f55c3e07eb6f99f25f25885a45c495b6647a (diff)
downloadpoky-c26566e44ba2e01111674d74a1c590ef6c5baa02.tar.gz
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 <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. (From OE-Core rev: 08636708f6ca677a6ee6c88fa2999c7b70b7d474) Signed-off-by: Khem Raj <raj.khem@gmail.com> The vlock doesn't exist if PAM isn't enabled. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/kbd/kbd_2.2.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb
index 9556302ab5..f2521617e5 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -61,7 +61,8 @@ RDEPENDS_${PN}-ptest = "make"
61 61
62inherit update-alternatives 62inherit update-alternatives
63 63
64ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" 64ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \
65 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}"
65ALTERNATIVE_PRIORITY = "100" 66ALTERNATIVE_PRIORITY = "100"
66 67
67BBCLASSEXTEND = "native" 68BBCLASSEXTEND = "native"