From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction
Date: Thu, 15 Dec 2016 14:52:21 +0100 [thread overview]
Message-ID: <20161215135222.16594-13-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20161215135222.16594-1-clemens.gruber@pqgruber.com>
Using sed instead of basename allows us to keep the _URL line as is, for
both the two- and three-part version numbers and not switch between
using and not using the basename command every release.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-__progname-redefinition-fix.patch | 0
patches/{util-linux-2.28.2 => util-linux-2.29}/series | 0
rules/util-linux-ng.make | 11 +++++++----
3 files changed, 7 insertions(+), 4 deletions(-)
rename patches/{util-linux-2.28.2 => util-linux-2.29}/0001-__progname-redefinition-fix.patch (100%)
rename patches/{util-linux-2.28.2 => util-linux-2.29}/series (100%)
diff --git a/patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.28.2/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.28.2/series b/patches/util-linux-2.29/series
similarity index 100%
rename from patches/util-linux-2.28.2/series
rename to patches/util-linux-2.29/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index e1c86c2..44cc04e 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,11 +17,12 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
#
# Paths and names
#
-UTIL_LINUX_NG_VERSION := 2.28.2
-UTIL_LINUX_NG_MD5 := 46a232a37bce45371a86d19300edc47a
+UTIL_LINUX_NG_VERSION := 2.29
+UTIL_LINUX_NG_MD5 := 07b6845f48a421ad5844aa9d58edb837
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
-UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v$(basename $(UTIL_LINUX_NG_VERSION))/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
+UTIL_LINUX_NG_BASENAME := v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
+UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
UTIL_LINUX_NG_LICENSE := GPL-2.0, GPL-2.0+, GPL-3.0+, LGPL-2.0+, BSD-3-Clause, BSD-4-Clause, public_domain
@@ -59,10 +60,10 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-static-programs \
--enable-all-programs=undefined \
--enable-tls \
+ --disable-widechar \
--$(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 \
- --enable-libmount-force-mountinfo \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
@@ -78,6 +79,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-setpriv \
--disable-eject \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
+ --disable-plymouth_support \
--disable-cramfs \
--disable-bfs \
--disable-minix \
@@ -132,6 +134,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--without-audit \
--without-udev \
--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
+ --without-ncursesw \
--without-slang \
--without-tinfo \
--without-readline \
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2016-12-15 13:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] dbus: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
2016-12-16 15:05 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] glib: " Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
2016-12-16 15:12 ` Michael Olbrich
2016-12-17 19:51 ` Clemens Gruber
2017-01-04 16:33 ` Michael Olbrich
2017-01-04 20:34 ` Robert Schwebel
2016-12-15 13:52 ` [ptxdist] [PATCH] iproute2: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Clemens Gruber
2016-12-16 15:22 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] sqlite: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] systemd-bootchart: update to 231 Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
2016-12-16 15:25 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] u-boot-tools: " Clemens Gruber
2016-12-15 13:52 ` Clemens Gruber [this message]
2016-12-16 15:30 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] picocom: update to version 2.2 Clemens Gruber
2016-12-16 15:53 ` [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support 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=20161215135222.16594-13-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.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