diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2020-02-04 07:06:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 18:43:08 +0000 |
commit | e547b2c85ff9e89b54bc1f97f91da46bd76ed0d2 (patch) | |
tree | cb74634deeb9e2f44b68c9a30ed880a40475748b /meta/recipes-core/kbd/kbd_2.0.4.bb | |
parent | d4cd1c045e9465524dd783da152711ad5ff23fa1 (diff) | |
download | poky-e547b2c85ff9e89b54bc1f97f91da46bd76ed0d2.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: d00349526f5727fdff9b40c6139d95bd75af213d)
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>
Signed-off-by: De Huo <de.huo@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/kbd/kbd_2.0.4.bb')
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.0.4.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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" | |||
59 | 59 | ||
60 | inherit update-alternatives | 60 | inherit update-alternatives |
61 | 61 | ||
62 | ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" | 62 | ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ |
63 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" | ||
63 | ALTERNATIVE_PRIORITY = "100" | 64 | ALTERNATIVE_PRIORITY = "100" |
64 | 65 | ||
65 | BBCLASSEXTEND = "native" | 66 | BBCLASSEXTEND = "native" |