Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Norbert Lange <nolange79@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 07/14] package/systemd: fixup RPATH for more systemd host binaries
Date: Mon, 15 Jun 2020 09:20:47 +0200	[thread overview]
Message-ID: <20200615072055.2083-8-nolange79@gmail.com> (raw)
In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com>

All systemd binaries depend on libsystemd-shared and need their
RPATH fixed. Use a glob to catch them all

Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
 package/systemd/systemd.mk | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 2cc71ee667..2c7f35bf25 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -659,6 +659,8 @@ HOST_SYSTEMD_DEPENDENCIES = \
 	host-libcap \
 	host-gperf
 
+HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)
+
 # Fix RPATH After installation
 # * systemd provides a install_rpath instruction to meson because the binaries
 #   need to link with libsystemd which is not in a standard path
@@ -667,20 +669,11 @@ HOST_SYSTEMD_DEPENDENCIES = \
 # * the original path had been tweaked by buildroot via LDFLAGS to add
 #   $(HOST_DIR)/lib
 # * thus re-tweak rpath after the installation for all binaries that need it
-HOST_SYSTEMD_HOST_TOOLS = \
-	systemd-analyze \
-	systemd-machine-id-setup \
-	systemd-mount \
-	systemd-nspawn \
-	systemctl \
-	udevadm
-
-HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)
 
 define HOST_SYSTEMD_FIX_RPATH
-	$(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \
-		$(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f)
-	)
+	cd $(HOST_DIR)/bin && for f in journalctl systemctl udevadm systemd-*; do \
+	  [ ! -x $$f ] || $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $$f; \
+	  done
 endef
 HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH
 
-- 
2.27.0

  parent reply	other threads:[~2020-06-15  7:20 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-15  7:20 [Buildroot] systemd improvements V2 Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 01/14] package/systemd: configure nss plugins in nsswitch.conf Norbert Lange
2020-06-15 11:48   ` Yann E. MORIN
2020-06-15 12:14     ` Norbert Lange
2020-06-15 16:54       ` Yann E. MORIN
2020-06-16  6:17         ` Jérémy ROSEN
     [not found]         ` <CADYdroPsOpAcuBAmNe1H=N2of1PAZSBjq4=TyO+6hdFniNorTA@mail.gmail.com>
2020-06-25 22:27           ` [Buildroot] Fwd: " Norbert Lange
2020-06-27 12:14             ` Yann E. MORIN
2020-06-15 12:28     ` [Buildroot] " Norbert Lange
2020-06-17 21:13       ` Yann E. MORIN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 02/14] package/systemd: remove unused user accounts Norbert Lange
2020-06-15  9:42   ` Yann E. MORIN
2020-06-15 10:38     ` Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 03/14] package/systemd: create "remote" user if the feature is enabled Norbert Lange
2020-06-15  9:46   ` Yann E. MORIN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 04/14] package/systemd: cosmetic rearrange list of users Norbert Lange
2020-07-18 11:46   ` Yann E. MORIN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 05/14] package/systemd: sync user comments to upstream Norbert Lange
2020-06-15  9:47   ` Yann E. MORIN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 06/14] Makefile: Handle systemd catalogs in PURGE_LOCALES Norbert Lange
2020-06-15  7:20 ` Norbert Lange [this message]
2020-06-15  9:53   ` [Buildroot] [PATCH v2 07/14] package/systemd: fixup RPATH for more systemd host binaries Yann E. MORIN
2020-06-15 10:29     ` Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 08/14] package/systemd: add hook to update journalctl catalogs Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 09/14] package/systemd: option to delete all catalog files Norbert Lange
2020-06-15 14:27   ` Jérémy ROSEN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 10/14] package/systemd: invoke systemd-tmpfilesd on final image Norbert Lange
2020-06-15 14:32   ` Jérémy ROSEN
2020-06-15 14:58     ` Norbert Lange
2020-09-28 18:42       ` Adam Duskett
2020-09-28 19:00         ` Norbert Lange
2020-09-28 20:27           ` Adam Duskett
2020-09-29  8:40             ` Jérémy ROSEN
2020-06-15  7:20 ` [Buildroot] [PATCH v2 11/14] package/systemd: use an upstream patch for tmpfiles Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 12/14] package/systemd: pre-create directory for timesync user Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 13/14] systemd: remove hard dependency on dbus Norbert Lange
2020-06-15  7:20 ` [Buildroot] [PATCH v2 14/14] systemd: remove util-linux dependencies Norbert Lange

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=20200615072055.2083-8-nolange79@gmail.com \
    --to=nolange79@gmail.com \
    --cc=buildroot@busybox.net \
    /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