diff options
| author |   Kang Kai <kai.kang@windriver.com> | 2012-12-18 17:44:02 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-26 11:34:06 +0000 |
| commit | 2af073af00280e36295121e2a426ba88a4a39988 (patch) | |
| tree | 8b004a5b5f59c3c9f774c97089282045e8f4b4c8 /meta/recipes-core/base-passwd | |
| parent | 07b842ff053c9c738486e3b98c2121fee7817fbc (diff) | |
| download | openembedded-core-contrib-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.patch | 16 | ||||
| -rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.26.bb | 4 |
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 eab77f124f..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.26/root-home.patch +++ /dev/null @@ -1,16 +0,0 @@ -we use /home/root instead of /root - -Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 -+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root::0:0:root:/home/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - 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 3eae214157..2b1dc1c5b7 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://nobash.patch \ - file://root-home.patch" + file://nobash.patch" SRC_URI[md5sum] = "74245e5c21dc74d9675c77cd8dfa02e6" SRC_URI[sha256sum] = "258a78317aa563143d10375c6e1e63a60898e503887f00fffd70b6b297c1b429" @@ -25,6 +24,7 @@ do_install () { ${D}${mandir}/pl/man8/update-passwd.8 gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* install -d -m 755 ${D}${datadir}/base-passwd + sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ |