summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-11-09 17:02:43 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:43:37 +0000
commit48ee7e9b3ae18f79a00756ccec54a301adf4ab97 (patch)
treebe7a7bf5948842fdf49b2b35cd22462c5b6efcfe /meta
parent1278cee687bac030491866f9f97a0631f80a7477 (diff)
downloadpoky-48ee7e9b3ae18f79a00756ccec54a301adf4ab97.tar.gz
shadow: Generate the shadow files at rootfs construction
With the recent changes to the shadow-native package support "--root", we can now convert the passwd/group files to their shadow forms while doing the rootfs install, instead of waiting to run on the target. (From OE-Core rev: 662431ace246e9bb35ad8d0ddd0510193f93517d) (From OE-Core rev: 03c366bb36145f7bc1679307e578bb2cf44e3737) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb12
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 5bc4a6183e..25330a4cef 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
9 9
10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
12PR = "r4" 12PR = "r5"
13 13
14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
15 file://login_defs_pam.sed \ 15 file://login_defs_pam.sed \
@@ -128,11 +128,13 @@ pkg_postinst_${PN} () {
128 update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200 128 update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
129 129
130 if [ "x$D" != "x" ]; then 130 if [ "x$D" != "x" ]; then
131 exit 1 131 rootarg="--root=$D"
132 fi 132 else
133 rootarg=""
134 fi
133 135
134 pwconv 136 pwconv $rootarg
135 grpconv 137 grpconv $rootarg
136} 138}
137 139
138pkg_prerm_${PN} () { 140pkg_prerm_${PN} () {