[ptxdist] [PATCH v3 1/2] install_dir: Allow one to specify an alternate root dir

[ptxdist] [PATCH v3 1/2] install_dir: Allow one to specify an alternate root dir

[jon]

From: Jon Ringle <jringle@gridpoint.com>

This is useful if you install a package to /opt and libs are in /opt/lib:
    $(call install_lib, foo, 0, 0, 0644, libfoo, /opt)

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 rules/post/install.make           |  4 +++-
 scripts/lib/ptxd_make_xpkg_pkg.sh | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/rules/post/install.make b/rules/post/install.make
index d57e5dd..2ff9f40 100644
--- a/rules/post/install.make
+++ b/rules/post/install.make
@@ -231,6 +231,7 @@ install_package =		\
 # $3: GID
 # $4: permissions (octal)
 # $5: library name without suffix.
+# $6: optional root dir
 #
 install_lib =			\
 	XPKG=$(subst _,-,$(strip $(1)));	\
@@ -238,8 +239,9 @@ install_lib =			\
 	GRP="$(strip $(3))";	\
 	PER="$(strip $(4))";	\
 	LIB=$(strip $(5));	\
+	DST=$(strip $(6)); \
 	$(call install_check, install_lib);	\
-	echo "ptxd_install_lib '$$LIB' '$$OWN' '$$GRP' '$$PER'" >> "$(STATEDIR)/$$XPKG.cmds"
+	echo "ptxd_install_lib '$$LIB' '$$DST' '$$OWN' '$$GRP' '$$PER'" >> "$(STATEDIR)/$$XPKG.cmds"
 
 #
 # install_replace
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 86196a2..5c5ce67 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -744,9 +744,18 @@ export -f ptxd_install_shared
 ptxd_install_lib() {
     local lib_dir=$(ptxd_get_lib_dir)
     local lib="$1"
-    shift
+    local root_dir="${2}"
+    shift 2
+
+    if [ -n "${root_dir}" ]; then
+	root_dir="${root_dir%/}"
+
+	if [[ "${root_dir}" != /* ]]; then
+	    ptxd_install_error "ptxd_lib_install: root_dir '${root_dir}' must be absolute"
+	fi
+    fi
 
-    local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}${lib_dir}; do
+    local file="$(for dir in "${pkg_pkg_dir}"${root_dir}{/,/usr/}${lib_dir}; do
 	    find "${dir}" -type f -path "${dir}/${lib}.so*"; done 2>/dev/null)"
 
     if [ ! -f "${file}" ]; then
-- 
1.8.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 2/2] systemd: PTXCONF_SYSTEMD_COREDUMP

[jon]

From: Jon Ringle <jringle@gridpoint.com>

Allow coredumpctl to be built and installed to debug crashing systemd
services

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

diff --git a/rules/systemd.in b/rules/systemd.in
index ba69d8b..b6cdc1b 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -81,5 +81,11 @@ config SYSTEMD_TIMEDATE
 	help
 	  NTP client for time synchronization and local timezone handling.
 
+config SYSTEMD_COREDUMP
+	bool
+	prompt "enable generating coredumps"
+	help
+	  Enable this only if you need to debug a crashing systemd service
+
 endif
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 51ffcac..110f6a5 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -102,7 +102,7 @@ SYSTEMD_CONF_OPT	:= \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_TIMEDATE)-timedated \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_TIMEDATE)-timesyncd \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_LOCALES)-localed \
-	--disable-coredump \
+	--$(call ptx/endis,PTXCONF_SYSTEMD_COREDUMP)-coredump \
 	--disable-polkit \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-resolved \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \
@@ -170,6 +170,7 @@ SYSTEMD_HELPER := \
 	systemd-bootchart \
 	systemd-bus-proxyd \
 	systemd-cgroups-agent \
+	$(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump,) \
 	systemd-fsck \
 	systemd-hostnamed \
 	systemd-initctl \
-- 
1.8.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de