diff options
author | Jiaqing Zhao <jiaqing.zhao@linux.intel.com> | 2022-05-23 10:20:14 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-23 21:31:31 +0100 |
commit | 80135f1cf2beeb43fec150fd7b942367b2401b90 (patch) | |
tree | fddb7240235d6ddf502d1c5409dc7d3a4d309b6f /meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch | |
parent | c2dc736f15b6bd02d1a1e779bdb097e99367ada7 (diff) | |
download | poky-80135f1cf2beeb43fec150fd7b942367b2401b90.tar.gz |
systemd: Correct path returned in sd_path_lookup()
In oe-core, sysusers.d/sysctl.d/binfmt.d/modules-load.d are still kept
under /usr/lib instead of /lib changed in systemd v246. This patch
corrects the SD_PATH_{SYSUSERS,SYSCTL,BINFMT,MODULES_LOAD} returned
in sd_path_lookup() back to the /usr/lib ones.
Also updates the patch description and upstream status.
(From OE-Core rev: 8d913ab6db3ae4b2786a64a086d519a40dcb8c4d)
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch | 42 |
1 files changed, 0 insertions, 42 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 deleted file mode 100644 index 752824688f..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
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 | diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in | ||
16 | index b5cc8f9..21dbf30 100644 | ||
17 | --- a/src/core/systemd.pc.in | ||
18 | +++ b/src/core/systemd.pc.in | ||
19 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} | ||
20 | tmpfiles_dir=${prefix}/lib/tmpfiles.d | ||
21 | tmpfilesdir=${tmpfiles_dir} | ||
22 | |||
23 | -sysusers_dir=${rootprefix}/lib/sysusers.d | ||
24 | +sysusers_dir=${prefix}/lib/sysusers.d | ||
25 | sysusersdir=${sysusers_dir} | ||
26 | |||
27 | -sysctl_dir=${rootprefix}/lib/sysctl.d | ||
28 | +sysctl_dir=${prefix}/lib/sysctl.d | ||
29 | sysctldir=${sysctl_dir} | ||
30 | |||
31 | -binfmt_dir=${rootprefix}/lib/binfmt.d | ||
32 | +binfmt_dir=${prefix}/lib/binfmt.d | ||
33 | binfmtdir=${binfmt_dir} | ||
34 | |||
35 | -modules_load_dir=${rootprefix}/lib/modules-load.d | ||
36 | +modules_load_dir=${prefix}/lib/modules-load.d | ||
37 | modulesloaddir=${modules_load_dir} | ||
38 | |||
39 | catalog_dir=${prefix}/lib/systemd/catalog | ||
40 | -- | ||
41 | 2.25.1 | ||
42 | |||