[ptxdist] [PATCH 1/2] procps: bump version to 3.3.11 and update paths

[ptxdist] [PATCH 1/2] procps: bump version to 3.3.11 and update paths

[Clemens Gruber]

Although the developers changed the binary paths, we maintain the
existing usr split. Everything stays where it was to avoid breaking
scripts.

There are no patches to migrate.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/procps.make | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/rules/procps.make b/rules/procps.make
index 0152548..b08991b 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
 #
 # Paths and names
 #
-PROCPS_VERSION	:= 3.3.10
-PROCPS_MD5	:= 1fb7f3f6bf92ce6c5c9ed9949ae858fe
+PROCPS_VERSION	:= 3.3.11
+PROCPS_MD5	:= 6cc5b94c1c5b8cbc89ad345a7b522f74
 PROCPS		:= procps-ng-$(PROCPS_VERSION)
 PROCPS_SUFFIX	:= tar.xz
 PROCPS_URL	:= $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
@@ -74,60 +74,60 @@ $(STATEDIR)/procps.targetinstall:
 	@$(call install_lib, procps, 0, 0, 0644, libprocps)
 
 ifdef PTXCONF_PROCPS_FREE
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/free, \
 		/usr/bin/free)
 endif
 ifdef PTXCONF_PROCPS_PGREP
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/pgrep, \
 		/usr/bin/pgrep)
 endif
 ifdef PTXCONF_PROCPS_PIDOF
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/pidof, \
 		/usr/bin/pidof)
 endif
 ifdef PTXCONF_PROCPS_PKILL
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/pkill, \
 		/usr/bin/pkill)
 endif
 ifdef PTXCONF_PROCPS_PMAP
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/pmap, \
 		/usr/bin/pmap)
 endif
 ifdef PTXCONF_PROCPS_PS
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/ps, \
 		/bin/ps)
 endif
 ifdef PTXCONF_PROCPS_PWDX
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/pwdx, \
 		/usr/bin/pwdx)
 endif
 ifdef PTXCONF_PROCPS_SLABTOP
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/slabtop, \
 		/usr/bin/slabtop)
 endif
 ifdef PTXCONF_PROCPS_SYSCTL
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/sbin/sysctl, \
 		/sbin/sysctl)
 	@$(call install_alternative, procps, 0, 0, 0644, /etc/sysctl.conf, n)
 endif
 ifdef PTXCONF_PROCPS_TOP
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/top, \
 		/usr/bin/top)
 endif
 ifdef PTXCONF_PROCPS_UPTIME
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/uptime, \
 		/usr/bin/uptime)
 endif
 ifdef PTXCONF_PROCPS_VMSTAT
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/vmstat, \
 		/usr/bin/vmstat)
 endif
 ifdef PTXCONF_PROCPS_W
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/w, \
 		/usr/bin/w)
 endif
 ifdef PTXCONF_PROCPS_WATCH
-	@$(call install_copy, procps, 0, 0, 0755, -, \
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_PKGDIR)/bin/watch, \
 		/usr/bin/watch)
 endif
 
-- 
2.7.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] Export LANG environment variable for systemd

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 projectroot/etc/profile.d/systemd.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/projectroot/etc/profile.d/systemd.sh b/projectroot/etc/profile.d/systemd.sh
index f51d8b9..c4aa9b3 100644
--- a/projectroot/etc/profile.d/systemd.sh
+++ b/projectroot/etc/profile.d/systemd.sh
@@ -1,2 +1,9 @@
+#!/bin/sh
+
+if [ -r /etc/locale.conf ]; then
+  . /etc/locale.conf
+  export LANG
+fi
+
 # set 'r', otherwise less breaks UTF-8 chars without UTF-8 locale
 export SYSTEMD_LESS="FrSXMK"
-- 
2.7.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de