[ptxdist] [PATCH v3 1/2] host-systemd: Fix rpath space problem

[ptxdist] [PATCH v3 1/2] host-systemd: Fix rpath space problem

[jon]

From: Jon Ringle <jringle@gridpoint.com>

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 <jringle@gridpoint.com>
---
 rules/host-systemd.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index 7f97a75..f134f13 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 \
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 2/2] host-systemd: Add option to install dev headers/libs

[jon]

From: Jon Ringle <jringle@gridpoint.com>

This option is to allow building a host package that requires compile and
linking against systemd

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 rules/host-systemd.in   | 6 ++++++
 rules/host-systemd.make | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/rules/host-systemd.in b/rules/host-systemd.in
index 4d82ffc..60af4fe 100644
--- a/rules/host-systemd.in
+++ b/rules/host-systemd.in
@@ -9,3 +9,9 @@ config HOST_SYSTEMD
 	select HOST_COREUTILS
 	select HOST_UTIL_LINUX_NG
 	select HOST_LIBCAP
+
+config HOST_SYSTEMD_INSTALL_DEV
+	bool
+	default n
+	help
+	  Install host systemd development headers/libs
diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index f134f13..604474f 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -121,7 +121,9 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	-Dxz=false \
 	-Dzlib=false
 
+ifndef PTXCONF_HOST_SYSTEMD_INSTALL_DEV
 HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
+endif
 
 # ----------------------------------------------------------------------------
 # Install
@@ -129,11 +131,15 @@ HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
 
 $(STATEDIR)/host-systemd.install:
 	@$(call targetinfo)
+ifdef PTXCONF_HOST_SYSTEMD_INSTALL_DEV
+	@$(call world/install, HOST_SYSTEMD)
+else
 	@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
+endif
 	@$(call touch)
 
 # vim: syntax=make
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de