Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Alex Kiernan" <alex.kiernan@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Subject: [OE-Core][PATCH 2/7] systemd: Fix path to modules-load.d et al
Date: Thu, 20 Aug 2020 10:20:36 +0000	[thread overview]
Message-ID: <20200820102041.28077-2-alex.kiernan@gmail.com> (raw)
In-Reply-To: <20200820102041.28077-1-alex.kiernan@gmail.com>

Following 4a56315a990b ("path: use ROOTPREFIX properly"), the paths to
sysusers.d, sysctl.d binfmt.d and modules-load.d changed to /lib when
building without usrmerge, which aoppears to be an inadvertent ABI
change. Undo this change and track upstream:

  https://github.com/systemd/systemd/issues/16773

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 ...0001-Use-PREFIX-ROOTPREFIX-correctly.patch | 81 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_246.bb      |  1 +
 2 files changed, 82 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch

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 000000000000..c61941df9181
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch
@@ -0,0 +1,81 @@
+From 2868e3b72d4ac02860e380d70c9af0d61a985790 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Sun, 16 Aug 2020 16:07:12 +0000
+Subject: [PATCH] Use PREFIX/ROOTPREFIX correctly
+
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+Upstream-status: Pending [https://github.com/systemd/systemd/issues/16773]
+---
+ meson.build                      | 1 +
+ src/core/systemd.pc.in           | 8 ++++----
+ src/libsystemd/sd-path/sd-path.c | 8 ++++----
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index dbbddb68e232..18618dba0623 100644
+--- a/meson.build
++++ b/meson.build
+@@ -226,6 +226,7 @@ conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH',               join_paths(rootlib
+ conf.set_quoted('SYSTEMCTL_BINARY_PATH',                      join_paths(rootbindir, 'systemctl'))
+ conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
+ conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH',           join_paths(bindir, 'systemd-stdio-bridge'))
++conf.set_quoted('PREFIX',                                     prefixdir)
+ conf.set_quoted('ROOTPREFIX',                                 rootprefixdir)
+ conf.set_quoted('RANDOM_SEED_DIR',                            randomseeddir)
+ conf.set_quoted('RANDOM_SEED',                                join_paths(randomseeddir, 'random-seed'))
+diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
+index 8424837824b5..410a126317ad 100644
+--- a/src/core/systemd.pc.in
++++ b/src/core/systemd.pc.in
+@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir}
+ tmpfiles_dir=${prefix}/lib/tmpfiles.d
+ tmpfilesdir=${tmpfiles_dir}
+ 
+-sysusers_dir=${rootprefix}/lib/sysusers.d
++sysusers_dir=${prefix}/lib/sysusers.d
+ sysusersdir=${sysusers_dir}
+ 
+-sysctl_dir=${rootprefix}/lib/sysctl.d
++sysctl_dir=${prefix}/lib/sysctl.d
+ sysctldir=${sysctl_dir}
+ 
+-binfmt_dir=${rootprefix}/lib/binfmt.d
++binfmt_dir=${prefix}/lib/binfmt.d
+ binfmtdir=${binfmt_dir}
+ 
+-modules_load_dir=${rootprefix}/lib/modules-load.d
++modules_load_dir=${prefix}/lib/modules-load.d
+ modulesloaddir=${modules_load_dir}
+ 
+ catalog_dir=${prefix}/lib/systemd/catalog
+diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
+index 736795d1d797..3572916dc073 100644
+--- a/src/libsystemd/sd-path/sd-path.c
++++ b/src/libsystemd/sd-path/sd-path.c
+@@ -371,19 +371,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
+                 return 0;
+ 
+         case SD_PATH_SYSUSERS:
+-                *ret = ROOTPREFIX "/lib/sysusers.d";
++                *ret = PREFIX "/lib/sysusers.d";
+                 return 0;
+ 
+         case SD_PATH_SYSCTL:
+-                *ret = ROOTPREFIX "/lib/sysctl.d";
++                *ret = PREFIX "/lib/sysctl.d";
+                 return 0;
+ 
+         case SD_PATH_BINFMT:
+-                *ret = ROOTPREFIX "/lib/binfmt.d";
++                *ret = PREFIX "/lib/binfmt.d";
+                 return 0;
+ 
+         case SD_PATH_MODULES_LOAD:
+-                *ret = ROOTPREFIX "/lib/modules-load.d";
++                *ret = PREFIX "/lib/modules-load.d";
+                 return 0;
+ 
+         case SD_PATH_CATALOG:
+-- 
+2.17.1
+
diff --git a/meta/recipes-core/systemd/systemd_246.bb b/meta/recipes-core/systemd/systemd_246.bb
index 11e3cd29665b..704a36e75d6d 100644
--- a/meta/recipes-core/systemd/systemd_246.bb
+++ b/meta/recipes-core/systemd/systemd_246.bb
@@ -20,6 +20,7 @@ SRC_URI += "file://touchscreen.rules \
            file://99-default.preset \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
+           file://0001-Use-PREFIX-ROOTPREFIX-correctly.patch \
            "
 
 # patches needed by musl
-- 
2.17.1


  reply	other threads:[~2020-08-20 10:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20 10:20 [OE-Core][PATCH 1/7] systemd: Move musl patches to SRC_URI_MUSL Alex Kiernan
2020-08-20 10:20 ` Alex Kiernan [this message]
2020-08-20 10:20 ` [OE-Core][PATCH 3/7] nfs-utils: Drop StandardError=syslog from systemd unit Alex Kiernan
2020-08-20 10:20 ` [OE-Core][PATCH 4/7] openssh: " Alex Kiernan
2020-08-20 10:20 ` [OE-Core][PATCH 5/7] volatile-binds: Drop StandardOutput=syslog " Alex Kiernan
2020-08-20 10:20 ` [OE-Core][PATCH 6/7] systemd: Upgrade v246 -> v246.1 Alex Kiernan
2020-08-20 10:20 ` [OE-Core][PATCH 7/7] systemd: Upgrade v246.1 -> v246.2 Alex Kiernan
2020-08-20 10:32 ` ✗ patchtest: failure for "systemd: Move musl patches to ..." and 6 more Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200820102041.28077-2-alex.kiernan@gmail.com \
    --to=alex.kiernan@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox