aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd_216.bb
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2014-09-03 13:49:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:31:55 +0100
commite1efc61979b329c651c15acff1afeba2987397b5 (patch)
tree584cad888ee0f88a68d275a8f136ce604b70d87b /meta/recipes-core/systemd/systemd_216.bb
parent97756472d3a69eaca95d105494ffea78c6b077e0 (diff)
downloadopenembedded-core-contrib-e1efc61979b329c651c15acff1afeba2987397b5.tar.gz
openembedded-core-contrib-e1efc61979b329c651c15acff1afeba2987397b5.tar.bz2
openembedded-core-contrib-e1efc61979b329c651c15acff1afeba2987397b5.zip
systemd: Use ${ROOT_HOME} instead of /root
systemd avoids using nss lookups for the root user, so naturally it assumes that root's home directory is /root. In OE that's not the case, and it can lead to long delays when shutting down due to user shutdown unit failures. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_216.bb')
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index ebf939574d..598d45e7de 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -32,6 +32,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
file://uclibc-get-physmem.patch \
file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \
file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
+ file://0001-Make-root-s-home-directory-configurable.patch \
file://touchscreen.rules \
file://00-create-volatile.conf \
file://init \
@@ -74,6 +75,7 @@ rootlibexecdir = "${rootprefix}/lib"
# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--with-rootlibdir=${rootlibdir} \
+ --with-roothomedir=${ROOT_HOME} \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
--disable-manpages \
--disable-coredump \
@@ -99,7 +101,6 @@ do_configure_prepend() {
else
cp -r ${S}/units ${S}/units.pre_sed
fi
- sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
sed -i '/ln --relative --help/d' ${S}/configure.ac
sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am