[ptxdist] [PATCH 2/2] util-linux: version bump 2.29.2 -> 2.30

[ptxdist] [PATCH 2/2] util-linux: version bump 2.29.2 -> 2.30

[Robert Schwebel]

The patches have been forward-ported. There are two new tools, lsmem and
chmem, which have been added.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 .../0001-__progname-redefinition-fix.patch                 |  0
 patches/{util-linux-2.29.2 => util-linux-2.30}/series      |  0
 rules/util-linux-ng.in                                     | 14 ++++++++++++++
 rules/util-linux-ng.make                                   | 12 ++++++++++--
 4 files changed, 24 insertions(+), 2 deletions(-)
 rename patches/{util-linux-2.29.2 => util-linux-2.30}/0001-__progname-redefinition-fix.patch (100%)
 rename patches/{util-linux-2.29.2 => util-linux-2.30}/series (100%)

diff --git a/patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.30/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.29.2/series b/patches/util-linux-2.30/series
similarity index 100%
rename from patches/util-linux-2.29.2/series
rename to patches/util-linux-2.30/series
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index dafe3d835..8141a392f 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -386,4 +386,18 @@ config UTIL_LINUX_NG_ZRAMCTL
 	help
 	  The zramctl program is a tool to set up and control zram devices.
 
+config UTIL_LINUX_NG_LSMEM
+	bool
+	prompt "lsmem"
+	help
+	  The lsmem command lists the ranges of available memory and
+          it's online status.
+
+config UTIL_LINUX_NG_CHMEM
+	bool
+	prompt "chmem"
+	help
+	  The chmem command sets a particular size or range of
+          memory online or offline.
+
 endif
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 3fa169373..9905a50ed 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
 #
 # Paths and names
 #
-UTIL_LINUX_NG_VERSION	:= 2.29.2
-UTIL_LINUX_NG_MD5	:= 63c40c2068fcbb7e1d5c1d281115d973
+UTIL_LINUX_NG_VERSION	:= 2.30
+UTIL_LINUX_NG_MD5	:= eaa3429150268027908a1b8ae6ee9a62
 UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
 UTIL_LINUX_NG_SUFFIX	:= tar.xz
 UTIL_LINUX_NG_BASENAME	:= v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
@@ -63,6 +63,8 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--enable-all-programs=undefined \
 	--enable-tls \
 	--disable-widechar \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
@@ -183,6 +185,12 @@ ifdef PTXCONF_UTIL_LINUX_NG_LIBFDISK
 	@$(call install_lib, util-linux-ng, 0, 0, 0644, libfdisk)
 endif
 
+ifdef PTXCONF_UTIL_LINUX_NG_LSMEM
+	@$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/lsmem)
+endif
+ifdef PTXCONF_UTIL_LINUX_NG_CHMEM
+	@$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/chmem)
+endif
 ifdef PTXCONF_UTIL_LINUX_NG_COLUMN
 	@$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/column)
 endif
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de