diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2015-04-09 13:49:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-10 18:10:24 +0100 |
commit | f23a3b6212048c256a50784a1a7f482622e4c67d (patch) | |
tree | 3a9e08d26c15753f397dfc6727294d990e3f7368 | |
parent | 8c24e4e48b983bad3b9e28ad704b5dd998fcbd3d (diff) | |
download | poky-f23a3b6212048c256a50784a1a7f482622e4c67d.tar.gz |
shadow: add 'util-linux-sulogin' to RDEPENDS
If shadow is installed, sulogin from busybox cannot work correctly because
it still assumes that /etc/shadow is not there. This leads to the problem
when booting into rescue mode in an image with shadow installed but not
sulogin from util-linux.
To fix this problem, we add 'util-linux-sulogin' to RDEPENDS of shadow.
This runtime dependency is specific to OE, because we have to ensure
that sulogin can work correctly and sulogin from busybox cannot because
FEATURE_SHADOWPASSWORDS is not enabled by default. And we cannot enable
it by default for busybox, because that would lead to utilities in busybox
to assume the existence of /etc/shadow which is not always true in OE.
[YOCTO #6698]
(From OE-Core rev: 9b45b990d2fc870df556f05908dcb48b9ebcfc02)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index bb3a927c17..a05ead35b7 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -83,7 +83,8 @@ PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" | |||
83 | PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" | 83 | PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" |
84 | 84 | ||
85 | RDEPENDS_${PN} = "shadow-securetty \ | 85 | RDEPENDS_${PN} = "shadow-securetty \ |
86 | base-passwd" | 86 | base-passwd \ |
87 | util-linux-sulogin" | ||
87 | RDEPENDS_${PN}_class-native = "" | 88 | RDEPENDS_${PN}_class-native = "" |
88 | RDEPENDS_${PN}_class-nativesdk = "" | 89 | RDEPENDS_${PN}_class-nativesdk = "" |
89 | 90 | ||