From: Jon Ringle <[email protected]>

Make room for chrpath manipulation in host-systemd.install.pack
The `-Drootprefix=/lib/..` adds sufficient space to avoids errors like:

new rpath '${ORIGIN}/../../../lib' too large; maximum length 16
ptxdist: error: Failed to adjust rpath for 
'/home/local/GRIDPOINT/jringle/git/rootfs/platform-ec1c/packages/host-systemd-239/usr/lib/systemd/systemd'

Signed-off-by: Jon Ringle <[email protected]>
---
 rules/host-systemd.make | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index 7f97a75..341daeb 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_SYSTEMD) += host-systemd
 HOST_SYSTEMD_CONF_TOOL := meson
 HOST_SYSTEMD_CONF_OPT  := \
        $(HOST_MESON_OPT) \
+       -Drootprefix=/lib/.. \
        -Dacl=false \
        -Dadm-group=true \
        -Dapparmor=false \
@@ -120,19 +121,4 @@ HOST_SYSTEMD_CONF_OPT      := \
        -Dxz=false \
        -Dzlib=false
 
-HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-systemd.install:
-       @$(call targetinfo)
-       @rm -rf $(HOST_SYSTEMD_PKGDIR)
-       @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/systemd-hwdb \
-               $(HOST_SYSTEMD_PKGDIR)/bin/systemd-hwdb
-       @install -vD -m755 
$(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so
 \
-               
$(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so
-       @$(call touch)
-
 # vim: syntax=make
-- 
1.9.1


_______________________________________________
ptxdist mailing list
[email protected]

Reply via email to