From: Armin Kuster <akuster808@gmail.com>
To: openembedded-core@openembedded.org
Subject: [zeus 4/8] kbd: avoid vlock conflict with busybox
Date: Tue, 4 Feb 2020 07:06:04 -0800 [thread overview]
Message-ID: <f89bb91cb40922434c331331f039b59900fe9f0c.1580828664.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1580828664.git.akuster808@gmail.com>
From: Hongxu Jia <hongxu.jia@windriver.com>
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>
---
meta/recipes-core/kbd/kbd_2.0.4.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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"
inherit update-alternatives
-ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey"
+ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}"
ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native"
--
2.17.1
next prev parent reply other threads:[~2020-02-04 15:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 15:06 [zeus 0/8] Merge request Armin Kuster
2020-02-04 15:06 ` [zeus 1/8] libxml2: Fix CVE-2019-19956 Armin Kuster
2020-02-04 15:06 ` [zeus 2/8] bash: Fix CVE-2019-18276 Armin Kuster
2020-02-05 0:56 ` Mittal, Anuj
2020-02-04 15:06 ` [zeus 3/8] kbd: configure.ac: Fix logic of vlock configure switch Armin Kuster
2020-02-04 15:06 ` Armin Kuster [this message]
2020-02-04 15:06 ` [zeus 5/8] bzip2: Fix CVE-2019-12900 Armin Kuster
2020-02-05 0:44 ` Mittal, Anuj
2020-02-04 15:06 ` [zeus 6/8] core: recipes: fix some native tools dependencies Armin Kuster
2020-02-04 15:06 ` [zeus 7/8] webkitgtk: fix occasional link error Armin Kuster
2020-02-04 15:06 ` [zeus 8/8] python2: add ntpath Armin Kuster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f89bb91cb40922434c331331f039b59900fe9f0c.1580828664.git.akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=openembedded-core@openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.