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 /patches | |
| 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>
Diffstat (limited to 'patches')
| -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 |
2 files changed, 0 insertions, 45 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 |