@@ -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,19 +669,10 @@ 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)
+ $(foreach f,$(wildcard $(addprefix $(HOST_DIR)/bin/,journalctl systemctl udevadm systemd-*)), \
+ $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(f)
)
endef
HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH
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> --- v1->v2: - dont ignore failure from patchelf --- package/systemd/systemd.mk | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)