summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-06-20 17:21:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:55:41 +0100
commit1ac7d1cab89f32280db0f103dbfd02455fea5b92 (patch)
treed3b7e816633d256406360d7053a5c7f9259d5985 /meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
parentc82a1b111dfb988a2a64a263ddd7fb482f67c80f (diff)
downloadpoky-1ac7d1cab89f32280db0f103dbfd02455fea5b92.tar.gz
base-passwd: remove login.defs references
login.defs is owned by shadow-utils, and doesn't belong here. The shadow-sysroot recipe was created to handle the case this was originally added for (useradd.bbclass support). (From OE-Core rev: 3244e21b0d4bd7472330d058b97dc62ea79e0ef9) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-passwd/base-passwd_3.5.22.bb')
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.22.bb9
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index 7b1fdf17c2..a155b4102d 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
7 7
8SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ 8SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
9 file://nobash.patch \ 9 file://nobash.patch \
10 file://root-home.patch \ 10 file://root-home.patch"
11 file://login.defs"
12 11
13SRC_URI[md5sum] = "47f22ab6b572d0133409ff6ad1fab402" 12SRC_URI[md5sum] = "47f22ab6b572d0133409ff6ad1fab402"
14SRC_URI[sha256sum] = "d34acb35a9f9f221e7e4f642b9ef4b22083dd77bb2fc7216756f445316d842fc" 13SRC_URI[sha256sum] = "d34acb35a9f9f221e7e4f642b9ef4b22083dd77bb2fc7216756f445316d842fc"
@@ -30,7 +29,6 @@ do_install () {
30 install -d -m 755 ${D}${datadir}/base-passwd 29 install -d -m 755 ${D}${datadir}/base-passwd
31 install -o root -g root -p -m 644 passwd.master ${D}${datadir}/base-passwd/ 30 install -o root -g root -p -m 644 passwd.master ${D}${datadir}/base-passwd/
32 install -o root -g root -p -m 644 group.master ${D}${datadir}/base-passwd/ 31 install -o root -g root -p -m 644 group.master ${D}${datadir}/base-passwd/
33 install -o root -g root -p -m 644 ${S}/../login.defs ${D}${datadir}/base-passwd/login.defs
34 32
35 install -d -m 755 ${D}${docdir}/${PN} 33 install -d -m 755 ${D}${docdir}/${PN}
36 install -p -m 644 debian/changelog ${D}${docdir}/${PN}/ 34 install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
@@ -49,10 +47,6 @@ pkg_postinst_${PN} () {
49 if [ ! -e $D${sysconfdir}/group ] ; then 47 if [ ! -e $D${sysconfdir}/group ] ; then
50 cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group 48 cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
51 fi 49 fi
52
53 if [ ! -e $D{sysconfdir}/login.defs ] ; then
54 cp $D${datadir}/base-passwd/login.defs $D${sysconfdir}/login.defs
55 fi
56 exit 0 50 exit 0
57} 51}
58 52
@@ -67,6 +61,5 @@ base_passwd_sstate_postinst() {
67 install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} 61 install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir}
68 install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ${STAGING_DIR_TARGET}${sysconfdir}/passwd 62 install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ${STAGING_DIR_TARGET}${sysconfdir}/passwd
69 install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ${STAGING_DIR_TARGET}${sysconfdir}/group 63 install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ${STAGING_DIR_TARGET}${sysconfdir}/group
70 install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/login.defs ${STAGING_DIR_TARGET}/${sysconfdir}/login.defs
71 fi 64 fi
72} 65}