summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Gruber <clemens.gruber@pqgruber.com>2017-09-01 18:39:28 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-09-05 08:08:12 +0200
commitb00b28040fd2f9514ad5b61d112fd7ac29dbd450 (patch)
treedf347a78a8a2a77bb224a5040d6a10d7a6c268bc
parentac4eff63a225433c08d85fb5ec3cc748fbf3d38b (diff)
downloadptxdist-b00b28040fd2f9514ad5b61d112fd7ac29dbd450.tar.gz
ptxdist-b00b28040fd2f9514ad5b61d112fd7ac29dbd450.tar.xz
util-linux-ng: version bump 2.30 -> 2.30.1
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch (renamed from patches/util-linux-2.30/0001-__progname-redefinition-fix.patch)2
-rw-r--r--patches/util-linux-2.30.1/series (renamed from patches/util-linux-2.30/series)0
-rw-r--r--rules/util-linux-ng.make8
3 files changed, 5 insertions, 5 deletions
diff --git a/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch
index f5f538fea..4b7594fcb 100644
--- a/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch
+++ b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jon Ringle <jon@ringle.org>
2 files changed, 2 insertions(+)
diff --git a/libmount/src/cache.c b/libmount/src/cache.c
-index b83706a37468..5ee4588263f8 100644
+index 6ff997140e06..40425b222825 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -23,6 +23,7 @@
diff --git a/patches/util-linux-2.30/series b/patches/util-linux-2.30.1/series
index 0c8bd3603..0c8bd3603 100644
--- a/patches/util-linux-2.30/series
+++ b/patches/util-linux-2.30.1/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index a0915bc02..99c4da88c 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.30
-UTIL_LINUX_NG_MD5 := eaa3429150268027908a1b8ae6ee9a62
+UTIL_LINUX_NG_VERSION := 2.30.1
+UTIL_LINUX_NG_MD5 := 5e5ec141e775efe36f640e62f3f8cd0d
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,8 +63,6 @@ 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 \
@@ -96,6 +94,8 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-logger \
--disable-switch_root \
--disable-pivot_root \
+ --$(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_IPCRM)-ipcrm \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCS)-ipcs \
--disable-tunelp \