Disable option for compilation with Address Sanitizer. Moved patch
series.
Signed-off-by: Alexander Dahl <a...@thorsis.com>
---
v1 -> v2: also move patch series
---
.../0001-__progname-redefinition-fix.patch | 2 +-
patches/{util-linux-2.31.1 => util-linux-2.32}/series | 0
rules/util-linux-ng.make | 5 +++--
3 files changed, 4 insertions(+), 3 deletions(-)
rename patches/{util-linux-2.31.1 =>
util-linux-2.32}/0001-__progname-redefinition-fix.patch (96%)
rename patches/{util-linux-2.31.1 => util-linux-2.32}/series (100%)
diff --git a/patches/util-linux-2.31.1/0001-__progname-redefinition-fix.patch
b/patches/util-linux-2.32/0001-__progname-redefinition-fix.patch
similarity index 96%
rename from patches/util-linux-2.31.1/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.32/0001-__progname-redefinition-fix.patch
index 4b7594fcb1..fbbc3080e9 100644
--- a/patches/util-linux-2.31.1/0001-__progname-redefinition-fix.patch
+++ b/patches/util-linux-2.32/0001-__progname-redefinition-fix.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jon Ringle <j...@ringle.org>
2 files changed, 2 insertions(+)
diff --git a/libmount/src/cache.c b/libmount/src/cache.c
-index 6ff997140e06..40425b222825 100644
+index b52ca809801a..e65a1a23772e 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -23,6 +23,7 @@
diff --git a/patches/util-linux-2.31.1/series b/patches/util-linux-2.32/series
similarity index 100%
rename from patches/util-linux-2.31.1/series
rename to patches/util-linux-2.32/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index ed0f85c02e..0961c4c657 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.31.1
-UTIL_LINUX_NG_MD5 := 7733b583dcb51518944d42aa62ef19ea
+UTIL_LINUX_NG_VERSION := 2.32
+UTIL_LINUX_NG_MD5 := e0d8a25853f88cd15ff557e5d8cb4ea7
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')
@@ -52,6 +52,7 @@ UTIL_LINUX_NG_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
+ --disable-asan \
--enable-shared \
--disable-static \
--disable-gtk-doc \
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
