]> code.ossystems Code Review - openembedded-core.git/commit
kbd: avoid vlock conflict with busybox
authorHongxu Jia <hongxu.jia@windriver.com>
Tue, 4 Feb 2020 15:06:04 +0000 (07:06 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Feb 2020 18:42:49 +0000 (18:42 +0000)
commitd00349526f5727fdff9b40c6139d95bd75af213d
tree01da5df574b69721b0a7ce0b83e1744d71c2b5ec
parentbb544a4d9b0b889d6acacdd73e3a790546fe13ba
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>
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>
meta/recipes-core/kbd/kbd_2.0.4.bb