diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-02 18:07:35 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-03 18:48:10 +0200 |
commit | 09654487985ec31c1668c32054311b20d84ddea6 (patch) | |
tree | f4ec88da0b763323ea4c8d3d4d0b4f8e639d0160 | |
parent | 1ab146cbac35806517568a0c09b7606143a7b9ac (diff) | |
download | ptxdist-09654487985ec31c1668c32054311b20d84ddea6.tar.gz ptxdist-09654487985ec31c1668c32054311b20d84ddea6.tar.xz |
util-linux-ng: version bump 2.32.1 -> 2.34
'include/c.h' includes 'errno.h' so the patch is not needed.
The License files were just renamed. And the GPL-3.0 code has been removed
a long time ago.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/util-linux-2.32.1/0001-__progname-redefinition-fix.patch | 41 | ||||
-rw-r--r-- | patches/util-linux-2.32.1/series | 4 | ||||
-rw-r--r-- | rules/util-linux-ng.in | 6 | ||||
-rw-r--r-- | rules/util-linux-ng.make | 18 |
4 files changed, 17 insertions, 52 deletions
diff --git a/patches/util-linux-2.32.1/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.32.1/0001-__progname-redefinition-fix.patch deleted file mode 100644 index fbbc3080e..000000000 --- a/patches/util-linux-2.32.1/0001-__progname-redefinition-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -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 <jon@ringle.org> ---- - 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 b52ca809801a..e65a1a23772e 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.32.1/series b/patches/util-linux-2.32.1/series deleted file mode 100644 index 0c8bd3603..000000000 --- a/patches/util-linux-2.32.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/rules/util-linux-ng.in b/rules/util-linux-ng.in index 8e89370f6..4f230bc60 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -26,6 +26,9 @@ config UTIL_LINUX_NG_LIBFDISK select UTIL_LINUX_NG_LIBUUID bool +config UTIL_LINUX_NG_FDISKS + bool + config UTIL_LINUX_NG_USES_NCURSES bool @@ -109,6 +112,7 @@ config UTIL_LINUX_NG_FDISK prompt "fdisk" select UTIL_LINUX_NG_LIBFDISK select UTIL_LINUX_NG_LIBSMARTCOLS + select UTIL_LINUX_NG_FDISKS depends on !BUSYBOX_FDISK || ALLYES help fdisk - Partition table manipulator for Linux @@ -121,6 +125,7 @@ config UTIL_LINUX_NG_SFDISK prompt "sfdisk" select UTIL_LINUX_NG_LIBFDISK select UTIL_LINUX_NG_LIBSMARTCOLS + select UTIL_LINUX_NG_FDISKS help sfdisk - Partition table manipulator for Linux, scriptable for unattended partitioning @@ -129,6 +134,7 @@ config UTIL_LINUX_NG_CFDISK bool select UTIL_LINUX_NG_LIBFDISK select UTIL_LINUX_NG_LIBSMARTCOLS + select UTIL_LINUX_NG_FDISKS select UTIL_LINUX_NG_USES_NCURSES prompt "cfdisk" help diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 86ed5120e..cda06a4a6 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -15,20 +15,20 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng # # Paths and names # -UTIL_LINUX_NG_VERSION := 2.32.1 -UTIL_LINUX_NG_MD5 := 9e5b1b8c1dc99455bdb6b462cf9436d9 +UTIL_LINUX_NG_VERSION := 2.34 +UTIL_LINUX_NG_MD5 := a78cbeaed9c39094b96a48ba8f891d50 UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION) UTIL_LINUX_NG_SUFFIX := tar.xz UTIL_LINUX_NG_BASENAME := v$(call ptx/sh, 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-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain +UTIL_LINUX_NG_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain UTIL_LINUX_NG_LICENSE_FILES := \ - file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ - file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ - file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c + file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ + file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ + file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c # ---------------------------------------------------------------------------- # Prepare @@ -53,6 +53,7 @@ UTIL_LINUX_NG_CONF_OPT := \ --disable-asan \ --enable-shared \ --disable-static \ + --enable-symvers \ --disable-gtk-doc \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-assert \ @@ -63,11 +64,13 @@ UTIL_LINUX_NG_CONF_OPT := \ --enable-tls \ --disable-widechar \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \ + --disable-libuuid-force-uuidd \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \ --disable-libmount-support-mtab \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \ + $(call ptx/ifdef, PTXCONF_UTIL_LINUX_NG_FDISKS,,--disable-fdisks) \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_ZRAMCTL)-zramctl \ @@ -79,6 +82,7 @@ UTIL_LINUX_NG_CONF_OPT := \ --disable-unshare \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_NSENTER)-nsenter \ --disable-setpriv \ + --disable-hardlink \ --disable-eject \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \ --disable-plymouth_support \ |