summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-passwd
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-12-18 09:44:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-26 11:34:06 (GMT)
commit2af073af00280e36295121e2a426ba88a4a39988 (patch)
tree8b004a5b5f59c3c9f774c97089282045e8f4b4c8 /meta/recipes-core/base-passwd
parent07b842ff053c9c738486e3b98c2121fee7817fbc (diff)
downloadpoky-2af073af00280e36295121e2a426ba88a4a39988.tar.gz
base-passwd: use configurable root home directory
Use configurable variable ROOT_HOME as root home directory. Drop root-home.patch because it is not needed any more. (From OE-Core rev: b5d84482b2762dca0660eb908bcc52aae278d00d) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-passwd')
-rw-r--r--meta/recipes-core/base-passwd/base-passwd-3.5.26/root-home.patch16
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.26.bb4
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.26/root-home.patch
deleted file mode 100644
index eab77f1..0000000
--- a/meta/recipes-core/base-passwd/base-passwd-3.5.26/root-home.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1we use /home/root instead of /root
2
3Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
4
5Upstream-Status: Inappropriate [configuration]
6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
9--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200
10+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200
11@@ -1,4 +1,4 @@
12-root::0:0:root:/root:/bin/sh
13+root::0:0:root:/home/root:/bin/sh
14 daemon:*:1:1:daemon:/usr/sbin:/bin/sh
15 bin:*:2:2:bin:/bin:/bin/sh
16 sys:*:3:3:sys:/dev:/bin/sh
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb
index 3eae214..2b1dc1c 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb
@@ -6,8 +6,7 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 6LIC_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"
11 10
12SRC_URI[md5sum] = "74245e5c21dc74d9675c77cd8dfa02e6" 11SRC_URI[md5sum] = "74245e5c21dc74d9675c77cd8dfa02e6"
13SRC_URI[sha256sum] = "258a78317aa563143d10375c6e1e63a60898e503887f00fffd70b6b297c1b429" 12SRC_URI[sha256sum] = "258a78317aa563143d10375c6e1e63a60898e503887f00fffd70b6b297c1b429"
@@ -25,6 +24,7 @@ do_install () {
25 ${D}${mandir}/pl/man8/update-passwd.8 24 ${D}${mandir}/pl/man8/update-passwd.8
26 gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* 25 gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/*
27 install -d -m 755 ${D}${datadir}/base-passwd 26 install -d -m 755 ${D}${datadir}/base-passwd
27 sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master
28 install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ 28 install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/
29 install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ 29 install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/
30 30