diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch new file mode 100644 index 0000000000..c13708728e --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From 8b82663aeeedf9ca58e3b97116b4c4da5229e0f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 27 Jun 2018 16:46:45 +0800 | ||
4 | Subject: [PATCH 5/9] Make root's home directory configurable | ||
5 | |||
6 | OpenEmbedded has a configurable home directory for root. Allow | ||
7 | systemd to be built using its idea of what root's home directory | ||
8 | should be. | ||
9 | |||
10 | Upstream-Status: Denied | ||
11 | Upstream wants to have a unified hierarchy where everyone is | ||
12 | using the same root folder. | ||
13 | https://github.com/systemd/systemd/issues/541 | ||
14 | |||
15 | Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
18 | --- | ||
19 | meson.build | 7 +++++++ | ||
20 | meson_options.txt | 2 ++ | ||
21 | 2 files changed, 9 insertions(+) | ||
22 | |||
23 | diff --git a/meson.build b/meson.build | ||
24 | index 6d5edcb4e..323146fe1 100644 | ||
25 | --- a/meson.build | ||
26 | +++ b/meson.build | ||
27 | @@ -89,6 +89,11 @@ if rootlibdir == '' | ||
28 | rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1]) | ||
29 | endif | ||
30 | |||
31 | +roothomedir = get_option('roothomedir') | ||
32 | +if roothomedir == '' | ||
33 | + roothomedir = '/root' | ||
34 | +endif | ||
35 | + | ||
36 | # Dirs of external packages | ||
37 | pkgconfigdatadir = join_paths(datadir, 'pkgconfig') | ||
38 | pkgconfiglibdir = join_paths(libdir, 'pkgconfig') | ||
39 | @@ -210,6 +215,7 @@ conf.set_quoted('UDEVLIBEXECDIR', udevlibexecdir) | ||
40 | conf.set_quoted('POLKIT_AGENT_BINARY_PATH', join_paths(bindir, 'pkttyagent')) | ||
41 | conf.set_quoted('LIBDIR', libdir) | ||
42 | conf.set_quoted('ROOTLIBDIR', rootlibdir) | ||
43 | +conf.set_quoted('ROOTHOMEDIR', roothomedir) | ||
44 | conf.set_quoted('ROOTLIBEXECDIR', rootlibexecdir) | ||
45 | conf.set_quoted('BOOTLIBDIR', bootlibdir) | ||
46 | conf.set_quoted('SYSTEMD_PULL_PATH', join_paths(rootlibexecdir, 'systemd-pull')) | ||
47 | @@ -228,6 +234,7 @@ substs.set('prefix', prefixdir) | ||
48 | substs.set('exec_prefix', prefixdir) | ||
49 | substs.set('libdir', libdir) | ||
50 | substs.set('rootlibdir', rootlibdir) | ||
51 | +substs.set('roothomedir', roothomedir) | ||
52 | substs.set('includedir', includedir) | ||
53 | substs.set('pkgsysconfdir', pkgsysconfdir) | ||
54 | substs.set('bindir', bindir) | ||
55 | diff --git a/meson_options.txt b/meson_options.txt | ||
56 | index 16c1f2b2f..aa9a33368 100644 | ||
57 | --- a/meson_options.txt | ||
58 | +++ b/meson_options.txt | ||
59 | @@ -9,6 +9,8 @@ option('rootlibdir', type : 'string', | ||
60 | description : '''[/usr]/lib/x86_64-linux-gnu or such''') | ||
61 | option('rootprefix', type : 'string', | ||
62 | description : '''override the root prefix''') | ||
63 | +option('roothomedir', type : 'string', | ||
64 | + description : '''override the root home directory''') | ||
65 | option('link-udev-shared', type : 'boolean', | ||
66 | description : 'link systemd-udev and its helpers to libsystemd-shared.so') | ||
67 | option('link-systemctl-shared', type: 'boolean', | ||
68 | -- | ||
69 | 2.11.0 | ||
70 | |||