summaryrefslogtreecommitdiffstats
path: root/meta
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:43:51 +0100
commited3321d229a6e802052d2b802a721dbd9101e990 (patch)
tree6789cfd38e56f553611a317d33b6853ec9582ce3 /meta
parent39bd94a290365468b98d4bd811a85871ae1f4b08 (diff)
downloadpoky-ed3321d229a6e802052d2b802a721dbd9101e990.tar.gz
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. (From OE-Core rev: 51aaa647b203d0f7ddd2f53f7191c4d2918b09b8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
26index 0fb3f9f..4623963 100644 26index 0fb3f9f..4623963 100644
27--- a/Makefile.am 27--- a/Makefile.am
28+++ b/Makefile.am 28+++ b/Makefile.am
29@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ 29@@ -199,7 +199,8 @@ AM_CPPFLAGS = \
30 -DKEXEC=\"$(KEXEC)\" \ 30 -DKEXEC=\"$(KEXEC)\" \
31 -DLIBDIR=\"$(libdir)\" \ 31 -DLIBDIR=\"$(libdir)\" \
32 -DROOTLIBDIR=\"$(rootlibdir)\" \ 32 -DROOTLIBDIR=\"$(rootlibdir)\" \
33 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
33+ -DROOTHOMEDIR=\"$(roothomedir)\" \ 34+ -DROOTHOMEDIR=\"$(roothomedir)\" \
34 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ 35 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
35 -I $(top_srcdir)/src \ 36 -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
38 file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ 38 file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \
39 file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ 39 file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
40 file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ 40 file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \
41 file://0010-Make-root-s-home-directory-configurable.patch \
41 file://0011-systemd-user-avoid-using-system-auth.patch \ 42 file://0011-systemd-user-avoid-using-system-auth.patch \
42 file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ 43 file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
43 file://0014-Revert-rules-remove-firmware-loading-rules.patch \ 44 file://0014-Revert-rules-remove-firmware-loading-rules.patch \