On Fri, Jun 10, 2016 at 11:23:39AM +0200, Robert Schwebel wrote: > The new version checks for unrecognized options; --without-termcap is > outdated, so we remove it. The patches are ported. > > Signed-off-by: Robert Schwebel <[email protected]>
Thanks, applied. Next time, please don't forget to update possible host tools as well. Michael > --- > .../0001-__progname-redefinition-fix.patch | 67 > ---------------------- > patches/util-linux-2.27.1/series | 4 -- > .../0001-__progname-redefinition-fix.patch | 41 +++++++++++++ > patches/util-linux-2.28/series | 4 ++ > rules/util-linux-ng.make | 7 +-- > 5 files changed, 48 insertions(+), 75 deletions(-) > delete mode 100644 > patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch > delete mode 100644 patches/util-linux-2.27.1/series > create mode 100644 > patches/util-linux-2.28/0001-__progname-redefinition-fix.patch > create mode 100644 patches/util-linux-2.28/series > > diff --git a/patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch > b/patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch > deleted file mode 100644 > index 37220ca..0000000 > --- a/patches/util-linux-2.27.1/0001-__progname-redefinition-fix.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From: Jon Ringle <[email protected]> > -Date: Thu, 21 Apr 2011 17:08:15 -0400 > -Subject: [PATCH] __progname redefinition fix > - > -Problem occurs with uclibc errno.h header > - > -In file included from ../include/writeall.h:7, > - from swaplabel.c:35: > -/opt/crosstool-ng-1.9.0/arm-1136j-linux-uclibcgnueabi/gcc-4.4.5-uClibc-0.9.30.2-binutils-2.20.1-kernel-2.6.32.25-sanitized/arm-1136j-linux-uclibcgnueabi//sys-root/usr/include/errno.h:55: > error: conflicting types for '__progname' > -../include/c.h:118: note: previous declaration of '__progname' was here > - > -Signed-off-by: Jon Ringle <[email protected]> > ---- > - 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(+) > - > -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 > ---- a/libmount/src/cache.c > -+++ b/libmount/src/cache.c > -@@ -23,6 +23,7 @@ > - #include <unistd.h> > - #include <fcntl.h> > - #include <blkid.h> > -+#include <errno.h> > - > - #include "canonicalize.h" > - #include "mountP.h" > -diff --git a/libmount/src/iter.c b/libmount/src/iter.c > -index 016f88e3576d..0155d12130b3 100644 > ---- a/libmount/src/iter.c > -+++ b/libmount/src/iter.c > -@@ -16,6 +16,7 @@ > - #include <stdio.h> > - #include <string.h> > - #include <stdlib.h> > -+#include <errno.h> > - > - #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.27.1/series > deleted file mode 100644 > index 0c8bd36..0000000 > --- a/patches/util-linux-2.27.1/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-__progname-redefinition-fix.patch > -# fb5ea22852652bf376661837cc31854f - git-ptx-patches magic > diff --git a/patches/util-linux-2.28/0001-__progname-redefinition-fix.patch > b/patches/util-linux-2.28/0001-__progname-redefinition-fix.patch > new file mode 100644 > index 0000000..f5f538f > --- /dev/null > +++ b/patches/util-linux-2.28/0001-__progname-redefinition-fix.patch > @@ -0,0 +1,41 @@ > +From: Jon Ringle <[email protected]> > +Date: Thu, 21 Apr 2011 17:08:15 -0400 > +Subject: [PATCH] __progname redefinition fix > + > +Problem occurs with uclibc errno.h header > + > +In file included from ../include/writeall.h:7, > + from swaplabel.c:35: > +/opt/crosstool-ng-1.9.0/arm-1136j-linux-uclibcgnueabi/gcc-4.4.5-uClibc-0.9.30.2-binutils-2.20.1-kernel-2.6.32.25-sanitized/arm-1136j-linux-uclibcgnueabi//sys-root/usr/include/errno.h:55: > error: conflicting types for '__progname' > +../include/c.h:118: note: previous declaration of '__progname' was here > + > +Signed-off-by: Jon Ringle <[email protected]> > +--- > + libmount/src/cache.c | 1 + > + libmount/src/iter.c | 1 + > + 2 files changed, 2 insertions(+) > + > +diff --git a/libmount/src/cache.c b/libmount/src/cache.c > +index b83706a37468..5ee4588263f8 100644 > +--- a/libmount/src/cache.c > ++++ b/libmount/src/cache.c > +@@ -23,6 +23,7 @@ > + #include <unistd.h> > + #include <fcntl.h> > + #include <blkid.h> > ++#include <errno.h> > + > + #include "canonicalize.h" > + #include "mountP.h" > +diff --git a/libmount/src/iter.c b/libmount/src/iter.c > +index 016f88e3576d..0155d12130b3 100644 > +--- a/libmount/src/iter.c > ++++ b/libmount/src/iter.c > +@@ -16,6 +16,7 @@ > + #include <stdio.h> > + #include <string.h> > + #include <stdlib.h> > ++#include <errno.h> > + > + #include "mountP.h" > + > diff --git a/patches/util-linux-2.28/series b/patches/util-linux-2.28/series > new file mode 100644 > index 0000000..0c8bd36 > --- /dev/null > +++ b/patches/util-linux-2.28/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-__progname-redefinition-fix.patch > +# fb5ea22852652bf376661837cc31854f - git-ptx-patches magic > diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make > index 64e7639..ebd0f2e 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 \ > -- > 2.8.1 > > > _______________________________________________ > ptxdist mailing list > [email protected] -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected]
