diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch | 37 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_246.6.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch new file mode 100644 index 0000000000..622a4108bb --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 58860e0f248576a80ff2af256ba42713c186ae93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 29 Sep 2020 18:01:41 -0700 | ||
4 | Subject: [PATCH] systemd.pc.in: use ROOTPREFIX without suffixed slash | ||
5 | |||
6 | This complements the commit | ||
7 | https://github.com/poettering/systemd/commit/b612c26ceb9f56af0271fc9f07c1724d2d260a8a | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/core/systemd.pc.in | 8 ++++---- | ||
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
14 | |||
15 | --- a/src/core/systemd.pc.in | ||
16 | +++ b/src/core/systemd.pc.in | ||
17 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di | ||
18 | tmpfiles_dir=${prefix}/lib/tmpfiles.d | ||
19 | tmpfilesdir=${tmpfiles_dir} | ||
20 | |||
21 | -sysusers_dir=${rootprefix}/lib/sysusers.d | ||
22 | +sysusers_dir=${prefix}/lib/sysusers.d | ||
23 | sysusersdir=${sysusers_dir} | ||
24 | |||
25 | -sysctl_dir=${rootprefix}/lib/sysctl.d | ||
26 | +sysctl_dir=${prefix}/lib/sysctl.d | ||
27 | sysctldir=${sysctl_dir} | ||
28 | |||
29 | -binfmt_dir=${rootprefix}/lib/binfmt.d | ||
30 | +binfmt_dir=${prefix}/lib/binfmt.d | ||
31 | binfmtdir=${binfmt_dir} | ||
32 | |||
33 | -modules_load_dir=${rootprefix}/lib/modules-load.d | ||
34 | +modules_load_dir=${prefix}/lib/modules-load.d | ||
35 | modulesloaddir=${modules_load_dir} | ||
36 | |||
37 | catalog_dir=${prefix}/lib/systemd/catalog | ||
diff --git a/meta/recipes-core/systemd/systemd_246.6.bb b/meta/recipes-core/systemd/systemd_246.6.bb index c1424a1474..9215adf8dc 100644 --- a/meta/recipes-core/systemd/systemd_246.6.bb +++ b/meta/recipes-core/systemd/systemd_246.6.bb | |||
@@ -20,6 +20,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
20 | file://99-default.preset \ | 20 | file://99-default.preset \ |
21 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 21 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
22 | file://0003-implment-systemd-sysv-install-for-OE.patch \ | 22 | file://0003-implment-systemd-sysv-install-for-OE.patch \ |
23 | file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | # patches needed by musl | 26 | # patches needed by musl |