diff options
author | Eric Bénard <eric@eukrea.com> | 2012-12-21 10:30:41 +0100 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-12-21 10:30:41 +0100 |
commit | 19b9d85cca392834934b08e7151a447895fac13c (patch) | |
tree | 894f3203e10e989015862b97a8d1d47f6f27b9e9 /meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch | |
parent | e77646bc2cf905fd671fc5c19ab6fd17f9b94b3f (diff) | |
parent | 35f92b4bd4a5f9bbea61237dc7702d87a8812503 (diff) | |
download | meta-openembedded-19b9d85cca392834934b08e7151a447895fac13c.tar.gz |
Merge branch 'denzil-next' into denzil
Diffstat (limited to 'meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch')
-rw-r--r-- | meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch b/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch new file mode 100644 index 000000000..216721684 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | Upstream-Status: Undecided | ||
2 | |||
3 | This patch removes some of hardcoded references to /lib | ||
4 | and /usr/lib since on some architectures it should be | ||
5 | /lib64 and /usr/lib64 atleast in OE | ||
6 | |||
7 | I am not sure about the intention of hardcoded values | ||
8 | thats why status is undecided | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | Index: git/Makefile.am | ||
13 | =================================================================== | ||
14 | --- git.orig/Makefile.am 2012-07-22 16:20:38.424405916 -0700 | ||
15 | +++ git/Makefile.am 2012-07-22 16:23:21.232406621 -0700 | ||
16 | @@ -61,23 +61,23 @@ | ||
17 | |||
18 | # Our own, non-special dirs | ||
19 | pkgsysconfdir=$(sysconfdir)/systemd | ||
20 | -userunitdir=$(prefix)/lib/systemd/user | ||
21 | -tmpfilesdir=$(prefix)/lib/tmpfiles.d | ||
22 | -sysctldir=$(prefix)/lib/sysctl.d | ||
23 | -usergeneratordir=$(prefix)/lib/systemd/user-generators | ||
24 | +userunitdir=$(prefix)/$(rootlibdir)/systemd/user | ||
25 | +tmpfilesdir=$(prefix)/$(rootlibdir)/tmpfiles.d | ||
26 | +sysctldir=$(prefix)/$(rootlibdir)/sysctl.d | ||
27 | +usergeneratordir=$(prefix)/$(rootlibdir)/systemd/user-generators | ||
28 | pkgincludedir=$(includedir)/systemd | ||
29 | systemgeneratordir=$(rootlibexecdir)/system-generators | ||
30 | systemshutdowndir=$(rootlibexecdir)/system-shutdown | ||
31 | systemsleepdir=$(rootlibexecdir)/system-sleep | ||
32 | -systemunitdir=$(rootprefix)/lib/systemd/system | ||
33 | -udevlibexecdir=$(rootprefix)/lib/udev | ||
34 | +systemunitdir=$(rootprefix)/$(rootlibdir)/systemd/system | ||
35 | +udevlibexecdir=$(rootprefix)/$(rootlibdir)/udev | ||
36 | udevhomedir = $(udevlibexecdir) | ||
37 | udevrulesdir = $(udevlibexecdir)/rules.d | ||
38 | |||
39 | # And these are the special ones for / | ||
40 | rootprefix=@rootprefix@ | ||
41 | rootbindir=$(rootprefix)/bin | ||
42 | -rootlibexecdir=$(rootprefix)/lib/systemd | ||
43 | +rootlibexecdir=$(rootprefix)/$(rootlibdir)/systemd | ||
44 | |||
45 | CLEANFILES = | ||
46 | EXTRA_DIST = | ||
47 | @@ -126,7 +126,7 @@ | ||
48 | -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ | ||
49 | -DROOTPREFIX=\"$(rootprefix)\" \ | ||
50 | -DRUNTIME_DIR=\"/run\" \ | ||
51 | - -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ | ||
52 | + -DRANDOM_SEED=\"$(localstatedir)/$(rootlibdir)/random-seed\" \ | ||
53 | -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ | ||
54 | -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ | ||
55 | -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ | ||
56 | @@ -2535,7 +2535,7 @@ | ||
57 | |||
58 | binfmt-install-data-hook: | ||
59 | $(MKDIR_P) -m 0755 \ | ||
60 | - $(DESTDIR)$(prefix)/lib/binfmt.d \ | ||
61 | + $(DESTDIR)$(prefix)/$(rootlibdir)/binfmt.d \ | ||
62 | $(DESTDIR)$(sysconfdir)/binfmt.d \ | ||
63 | $(DESTDIR)$(systemunitdir)/sysinit.target.wants | ||
64 | ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ | ||
65 | @@ -3165,7 +3165,7 @@ | ||
66 | logind-install-data-hook: | ||
67 | $(MKDIR_P) -m 0755 \ | ||
68 | $(DESTDIR)$(systemunitdir)/multi-user.target.wants \ | ||
69 | - $(DESTDIR)$(localstatedir)/lib/systemd | ||
70 | + $(DESTDIR)$(localstatedir)/$(rootlibdir)/systemd | ||
71 | ( cd $(DESTDIR)$(systemunitdir) && \ | ||
72 | rm -f dbus-org.freedesktop.login1.service && \ | ||
73 | $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service) | ||
74 | @@ -3284,7 +3284,7 @@ | ||
75 | -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ | ||
76 | -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ | ||
77 | -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ | ||
78 | - -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \ | ||
79 | + -e 's,@RANDOM_SEED\@,$(localstatedir)/$(rootlibdir)/random-seed,g' \ | ||
80 | -e 's,@prefix\@,$(prefix),g' \ | ||
81 | -e 's,@exec_prefix\@,$(exec_prefix),g' \ | ||
82 | -e 's,@libdir\@,$(libdir),g' \ | ||
83 | @@ -3407,9 +3407,9 @@ | ||
84 | $(MKDIR_P) -m 0755 \ | ||
85 | $(DESTDIR)$(tmpfilesdir) \ | ||
86 | $(DESTDIR)$(sysconfdir)/tmpfiles.d \ | ||
87 | - $(DESTDIR)$(prefix)/lib/modules-load.d \ | ||
88 | + $(DESTDIR)$(prefix)/$(rootlibdir)/modules-load.d \ | ||
89 | $(DESTDIR)$(sysconfdir)/modules-load.d \ | ||
90 | - $(DESTDIR)$(prefix)/lib/sysctl.d \ | ||
91 | + $(DESTDIR)$(prefix)/$(rootlibdir)/sysctl.d \ | ||
92 | $(DESTDIR)$(sysconfdir)/sysctl.d \ | ||
93 | $(DESTDIR)$(systemshutdowndir) \ | ||
94 | $(DESTDIR)$(systemsleepdir) \ | ||