diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch b/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch new file mode 100644 index 0000000000..c61941df91 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From 2868e3b72d4ac02860e380d70c9af0d61a985790 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Sun, 16 Aug 2020 16:07:12 +0000 | ||
4 | Subject: [PATCH] Use PREFIX/ROOTPREFIX correctly | ||
5 | |||
6 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
7 | Upstream-status: Pending [https://github.com/systemd/systemd/issues/16773] | ||
8 | --- | ||
9 | meson.build | 1 + | ||
10 | src/core/systemd.pc.in | 8 ++++---- | ||
11 | src/libsystemd/sd-path/sd-path.c | 8 ++++---- | ||
12 | 3 files changed, 9 insertions(+), 8 deletions(-) | ||
13 | |||
14 | diff --git a/meson.build b/meson.build | ||
15 | index dbbddb68e232..18618dba0623 100644 | ||
16 | --- a/meson.build | ||
17 | +++ b/meson.build | ||
18 | @@ -226,6 +226,7 @@ conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlib | ||
19 | conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl')) | ||
20 | conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent')) | ||
21 | conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge')) | ||
22 | +conf.set_quoted('PREFIX', prefixdir) | ||
23 | conf.set_quoted('ROOTPREFIX', rootprefixdir) | ||
24 | conf.set_quoted('RANDOM_SEED_DIR', randomseeddir) | ||
25 | conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed')) | ||
26 | diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in | ||
27 | index 8424837824b5..410a126317ad 100644 | ||
28 | --- a/src/core/systemd.pc.in | ||
29 | +++ b/src/core/systemd.pc.in | ||
30 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} | ||
31 | tmpfiles_dir=${prefix}/lib/tmpfiles.d | ||
32 | tmpfilesdir=${tmpfiles_dir} | ||
33 | |||
34 | -sysusers_dir=${rootprefix}/lib/sysusers.d | ||
35 | +sysusers_dir=${prefix}/lib/sysusers.d | ||
36 | sysusersdir=${sysusers_dir} | ||
37 | |||
38 | -sysctl_dir=${rootprefix}/lib/sysctl.d | ||
39 | +sysctl_dir=${prefix}/lib/sysctl.d | ||
40 | sysctldir=${sysctl_dir} | ||
41 | |||
42 | -binfmt_dir=${rootprefix}/lib/binfmt.d | ||
43 | +binfmt_dir=${prefix}/lib/binfmt.d | ||
44 | binfmtdir=${binfmt_dir} | ||
45 | |||
46 | -modules_load_dir=${rootprefix}/lib/modules-load.d | ||
47 | +modules_load_dir=${prefix}/lib/modules-load.d | ||
48 | modulesloaddir=${modules_load_dir} | ||
49 | |||
50 | catalog_dir=${prefix}/lib/systemd/catalog | ||
51 | diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c | ||
52 | index 736795d1d797..3572916dc073 100644 | ||
53 | --- a/src/libsystemd/sd-path/sd-path.c | ||
54 | +++ b/src/libsystemd/sd-path/sd-path.c | ||
55 | @@ -371,19 +371,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { | ||
56 | return 0; | ||
57 | |||
58 | case SD_PATH_SYSUSERS: | ||
59 | - *ret = ROOTPREFIX "/lib/sysusers.d"; | ||
60 | + *ret = PREFIX "/lib/sysusers.d"; | ||
61 | return 0; | ||
62 | |||
63 | case SD_PATH_SYSCTL: | ||
64 | - *ret = ROOTPREFIX "/lib/sysctl.d"; | ||
65 | + *ret = PREFIX "/lib/sysctl.d"; | ||
66 | return 0; | ||
67 | |||
68 | case SD_PATH_BINFMT: | ||
69 | - *ret = ROOTPREFIX "/lib/binfmt.d"; | ||
70 | + *ret = PREFIX "/lib/binfmt.d"; | ||
71 | return 0; | ||
72 | |||
73 | case SD_PATH_MODULES_LOAD: | ||
74 | - *ret = ROOTPREFIX "/lib/modules-load.d"; | ||
75 | + *ret = PREFIX "/lib/modules-load.d"; | ||
76 | return 0; | ||
77 | |||
78 | case SD_PATH_CATALOG: | ||
79 | -- | ||
80 | 2.17.1 | ||
81 | |||