summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-04-28 21:11:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-03 11:39:48 +0100
commit51aaa647b203d0f7ddd2f53f7191c4d2918b09b8 (patch)
treec032d5ac41972123c3720d393c3cfe9808f862bf
parent6e4a10ab030c192e2437592538e4713b1ee2032b (diff)
downloadopenembedded-core-51aaa647b203d0f7ddd2f53f7191c4d2918b09b8.tar.gz
openembedded-core-51aaa647b203d0f7ddd2f53f7191c4d2918b09b8.tar.bz2
openembedded-core-51aaa647b203d0f7ddd2f53f7191c4d2918b09b8.zip
systemd: bring back the patch to customise root's $HOME
This patch appears to have been accidently dropped in the move to 219-stable, probably because it didn't apply. Update the patch and re-add it. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch3
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
index 41b903951e..b65fe423a5 100644
--- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
@@ -26,10 +26,11 @@ diff --git a/Makefile.am b/Makefile.am
index 0fb3f9f..4623963 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -199,6 +199,7 @@ AM_CPPFLAGS = \
+@@ -199,7 +199,8 @@ AM_CPPFLAGS = \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
+ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
+ -DROOTHOMEDIR=\"$(roothomedir)\" \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index d1303f7e89..c196017e1e 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -38,6 +38,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab
file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \
file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \
+ file://0010-Make-root-s-home-directory-configurable.patch \
file://0011-systemd-user-avoid-using-system-auth.patch \
file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
file://0014-Revert-rules-remove-firmware-loading-rules.patch \