summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-12-18 17:03:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-26 11:34:06 +0000
commit07b842ff053c9c738486e3b98c2121fee7817fbc (patch)
treedef9bf575e4dc11ec82375a979e979f66a893457
parentde5b44a74018c49b6f3079c4c5085b4146b422c4 (diff)
downloadpoky-07b842ff053c9c738486e3b98c2121fee7817fbc.tar.gz
base-files: use dynamic root home directory
Use var ROOT_HOME to configure root home directory dynamically. (From OE-Core rev: 341da5b6e46e0884d60e9462d1306d525fa99b94) 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>
-rw-r--r--meta/recipes-core/base-files/base-files/profile2
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index e9408d17d7..8eeaac3693 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -11,7 +11,7 @@ if [ ! -e /etc/localtime ]; then
11 export TZ 11 export TZ
12fi 12fi
13 13
14if [ "$HOME" = "/home/root" ]; then 14if [ "$HOME" = "ROOTHOME" ]; then
15 PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin 15 PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
16fi 16fi
17if [ "$PS1" ]; then 17if [ "$PS1" ]; then
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index ba355ee07c..39faad96e5 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -34,7 +34,7 @@ docdir_append = "/${P}"
34dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" 34dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
35dirs2775 = "/home ${prefix}/src ${localstatedir}/local" 35dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
36dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ 36dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
37 ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \ 37 ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /sbin \
38 ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \ 38 ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
39 ${libdir} ${sbindir} ${datadir} \ 39 ${libdir} ${sbindir} ${datadir} \
40 ${datadir}/common-licenses ${datadir}/dict ${infodir} \ 40 ${datadir}/common-licenses ${datadir}/dict ${infodir} \
@@ -94,6 +94,7 @@ do_install () {
94 install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab 94 install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
95 install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems 95 install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
96 install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd 96 install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
97 sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile
97 install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile 98 install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
98 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells 99 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
99 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile 100 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile