diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-06-10 11:23:39 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-13 13:09:23 +0200 |
commit | 80616579001bf19e5e1069996be9de4447f23d55 (patch) | |
tree | 1a9a6b8d9883c87e08af6e65ba2dbbc933e62644 | |
parent | 1790321194120f53b9f4c5daf32e271a6cc4e64c (diff) | |
download | ptxdist-80616579001bf19e5e1069996be9de4447f23d55.tar.gz ptxdist-80616579001bf19e5e1069996be9de4447f23d55.tar.xz |
util-linux-ng: version bump 2.27.1 -> 2.28
The new version checks for unrecognized options; --without-termcap is
outdated, so we remove it. The patches are ported.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
[mol: update host-util-linux-ng as well]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/util-linux-2.28/0001-__progname-redefinition-fix.patch (renamed from patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch) | 34 | ||||
-rw-r--r-- | patches/util-linux-2.28/series (renamed from patches/util-linux-2.27.1/series) | 0 | ||||
-rw-r--r-- | rules/host-util-linux-ng.make | 1 | ||||
-rw-r--r-- | rules/util-linux-ng.make | 7 |
4 files changed, 7 insertions, 35 deletions
diff --git a/patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.28/0001-__progname-redefinition-fix.patch index 37220ca96..f5f538fea 100644 --- a/patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch +++ b/patches/util-linux-2.28/0001-__progname-redefinition-fix.patch @@ -11,26 +11,12 @@ In file included from ../include/writeall.h:7, Signed-off-by: Jon Ringle <jon@ringle.org> --- - lib/at.c | 1 + - libmount/src/cache.c | 1 + - libmount/src/iter.c | 1 + - libmount/src/tab_parse.c | 1 + - 4 files changed, 4 insertions(+) + libmount/src/cache.c | 1 + + libmount/src/iter.c | 1 + + 2 files changed, 2 insertions(+) -diff --git a/lib/at.c b/lib/at.c -index f8bfe1399992..e715e5fd17ff 100644 ---- a/lib/at.c -+++ b/lib/at.c -@@ -10,6 +10,7 @@ - #include <stdlib.h> - #include <fcntl.h> - #include <sys/stat.h> -+#include <errno.h> - - #include "at.h" - #include "c.h" diff --git a/libmount/src/cache.c b/libmount/src/cache.c -index fcd84fde7dbb..c8cb8e8b0154 100644 +index b83706a37468..5ee4588263f8 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -23,6 +23,7 @@ @@ -53,15 +39,3 @@ index 016f88e3576d..0155d12130b3 100644 #include "mountP.h" -diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c -index 06c5bd469cd7..ce0075fc5bc2 100644 ---- a/libmount/src/tab_parse.c -+++ b/libmount/src/tab_parse.c -@@ -15,6 +15,7 @@ - #include <limits.h> - #include <dirent.h> - #include <fcntl.h> -+#include <errno.h> - - #include "at.h" - #include "mangle.h" diff --git a/patches/util-linux-2.27.1/series b/patches/util-linux-2.28/series index 0c8bd3603..0c8bd3603 100644 --- a/patches/util-linux-2.27.1/series +++ b/patches/util-linux-2.28/series diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make index 65dcc3f4f..a5c21f29f 100644 --- a/rules/host-util-linux-ng.make +++ b/rules/host-util-linux-ng.make @@ -51,7 +51,6 @@ HOST_UTIL_LINUX_NG_CONF_OPT := \ --without-libiconv-prefix \ --without-libintl-prefix \ --with-util \ - --without-termcap \ --without-audit \ --without-udev \ --without-ncurses \ diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 64e76393c..ebd0f2e80 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng # # Paths and names # -UTIL_LINUX_NG_VERSION := 2.27.1 -UTIL_LINUX_NG_MD5 := 3cd2698d1363a2c64091c2dadc974647 +UTIL_LINUX_NG_VERSION := 2.28 +UTIL_LINUX_NG_MD5 := e534e6ccc49107e5d31c329af798ef7d 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_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v$(UTIL_LINUX_NG_VERSION)/$(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 @@ -127,7 +127,6 @@ UTIL_LINUX_NG_CONF_OPT := \ --without-libiconv-prefix \ --without-libintl-prefix \ --with-util \ - --without-termcap \ --without-selinux \ --without-audit \ --without-udev \ |