Skip to contentSkip to conversation

package/systemd: fixup RPATH for more systemd host binaries

PATCH New Norbert Lange 3 participants 3 messages Jun 15, 2020 – Jul 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/systemd: fixup RPATH for more systemd host binaries

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

---
v1->v2:
- dont ignore failure from patchelf
v2->v3:
- change back to shell loop, the wildcard gets expanded before
the install step and is empty the first time
- add busctl

---
 package/systemd/systemd.mk | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
package/systemd/systemd.mk +7 -12
index 2cc71ee667..b04391da9e 100644
@@ -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,13 @@ 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)
+HOST_SYSTEMD_HOST_TOOLS = busctl journalctl systemctl udevadm systemd-*
 
 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 $(HOST_SYSTEMD_HOST_TOOLS); do \
+		set -e; \
+		[ ! -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
 
Signature · 1 line
2.27.0
#1 lore raw

PATCH v3 1/1 package/systemd: fixup RPATH for more systemd host binaries

Norbert, All,

On 2020-06-16 00:28 +0200, Norbert Lange spake thusly:

Quoted 4 lines

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

Applied to master, with the following changes:

- don't use 'set -e', use the more traditional '|| eixt 1'
- don't cd into HOST_DIR/bin, but use $(addprefix ...)
- use positive logic in the test
- expand commit log

... which makes it more in-line with how we're doing similar tweaks in other packages.

Thanks!

Regards,
Yann E. MORIN.

Quoted 53 lines

---
v1->v2:
- dont ignore failure from patchelf
v2->v3:

(quoted diff) +0 -3
-   change back to shell loop, the wildcard gets expanded before
    the install step and is empty the first time
-   add busctl
---
 package/systemd/systemd.mk | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
package/systemd/systemd.mk +7 -12
index 2cc71ee667..b04391da9e 100644
@@ -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,13 @@ 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)
+HOST_SYSTEMD_HOST_TOOLS = busctl journalctl systemctl udevadm systemd-*
 
 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 $(HOST_SYSTEMD_HOST_TOOLS); do \
+		set -e; \
+		[ ! -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
 
Signature · 1 line
2.27.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v3 1/1 package/systemd: fixup RPATH for more systemd host binaries

In reply to Norbert Lange
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Norbert" == Norbert Lange <[email protected]> writes:

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

---

v1-> v2:

Quoted 1 line

- dont ignore failure from patchelf

v2-> v3:

Review

Quoted 3 lines
(quoted diff) +0 -2
-   change back to shell loop, the wildcard gets expanded before
    the install step and is empty the first time
-   add busctl

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard