]> code.ossystems Code Review - openembedded-core.git/commit
kbd: avoid vlock conflict with busybox
authorHongxu Jia <hongxu.jia@windriver.com>
Sat, 14 Dec 2019 03:59:08 +0000 (11:59 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 15 Dec 2019 09:04:38 +0000 (09:04 +0000)
commit08636708f6ca677a6ee6c88fa2999c7b70b7d474
tree6cd23254370aa5400395a2bfe0b21bf4047d00b4
parent5dc43edab4787906f2c9f51e51bf78d1dc966286
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.

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>
meta/recipes-core/kbd/kbd_2.2.0.bb