From b00b28040fd2f9514ad5b61d112fd7ac29dbd450 Mon Sep 17 00:00:00 2001 From: Clemens Gruber Date: Fri, 1 Sep 2017 18:39:28 +0200 Subject: util-linux-ng: version bump 2.30 -> 2.30.1 Signed-off-by: Clemens Gruber Signed-off-by: Michael Olbrich --- .../0001-__progname-redefinition-fix.patch | 41 ++++++++++++++++++++++ patches/util-linux-2.30.1/series | 4 +++ .../0001-__progname-redefinition-fix.patch | 41 ---------------------- patches/util-linux-2.30/series | 4 --- 4 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch create mode 100644 patches/util-linux-2.30.1/series delete mode 100644 patches/util-linux-2.30/0001-__progname-redefinition-fix.patch delete mode 100644 patches/util-linux-2.30/series (limited to 'patches') diff --git a/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch new file mode 100644 index 000000000..4b7594fcb --- /dev/null +++ b/patches/util-linux-2.30.1/0001-__progname-redefinition-fix.patch @@ -0,0 +1,41 @@ +From: Jon Ringle +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 +--- + 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 6ff997140e06..40425b222825 100644 +--- a/libmount/src/cache.c ++++ b/libmount/src/cache.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #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 + #include + #include ++#include + + #include "mountP.h" + diff --git a/patches/util-linux-2.30.1/series b/patches/util-linux-2.30.1/series new file mode 100644 index 000000000..0c8bd3603 --- /dev/null +++ b/patches/util-linux-2.30.1/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/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch deleted file mode 100644 index f5f538fea..000000000 --- a/patches/util-linux-2.30/0001-__progname-redefinition-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Jon Ringle -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 ---- - 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 - #include - #include -+#include - - #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 - #include - #include -+#include - - #include "mountP.h" - diff --git a/patches/util-linux-2.30/series b/patches/util-linux-2.30/series deleted file mode 100644 index 0c8bd3603..000000000 --- a/patches/util-linux-2.30/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 -- cgit v1.2.3