From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] util-linux-ng: Upgrade from v2.31.1 to v2.32
Date: Mon, 26 Mar 2018 08:21:38 +0200 [thread overview]
Message-ID: <20180326062138.16965-1-ada@thorsis.com> (raw)
Disable option for compilation with Address Sanitizer. Moved patch
series.
Signed-off-by: Alexander Dahl <ada@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 <jon@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
next reply other threads:[~2018-03-26 6:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 6:21 Alexander Dahl [this message]
2018-03-26 8:04 ` Roland Hieber
2018-03-26 8:07 ` Alexander Dahl
2018-03-26 8:50 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180326062138.16965-1-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox