summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Ringle <jon@ringle.org>2011-08-08 19:15:13 -0400
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-08-09 18:18:35 +0200
commit6f56606e47c85380f733ff0e3cdeff2584990e9e (patch)
treefd39445043be4d566765aaa671cfdd308bb3e7c0
parent67cc9cb89b1208a56b3013cc2fd47454b3e58a27 (diff)
downloadptxdist-6f56606e47c85380f733ff0e3cdeff2584990e9e.tar.gz
ptxdist-6f56606e47c85380f733ff0e3cdeff2584990e9e.tar.xz
util-linux: patches to fix compile w/ uclibc toolchain
util-linux version bump 2.19 -> 2.19.1 replaced these patches with older patches and broke building on uclibc: Added these patches that fix problems when building with uclibc toolchain: 0002-__progname-redefinition-fix.patch 0003-_s-undeclared-fix.patch 0004-replace-index-with-strchr.patch Signed-off-by: Jon Ringle <jon@ringle.org> [mol: git ptx-patches reexecuted] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch13
-rw-r--r--patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch88
-rw-r--r--patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch12
-rw-r--r--patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch12
-rw-r--r--patches/util-linux-2.19.1/series3
5 files changed, 92 insertions, 36 deletions
diff --git a/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch b/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
index 4a8a06bab..770a9512e 100644
--- a/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
+++ b/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
@@ -1,17 +1,18 @@
From: Karel Zak <kzak@redhat.com>
Date: Fri, 11 Feb 2011 10:45:09 +0100
-Subject: [PATCH] libmount: add fallbacks for old systems without umount2() syscall
+Subject: [PATCH] libmount: add fallbacks for old systems without umount2()
+ syscall
Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
shlibs/mount/src/context_umount.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
+ 1 files changed, 28 insertions(+), 0 deletions(-)
-Index: util-linux-2.19.1/shlibs/mount/src/context_umount.c
-===================================================================
---- util-linux-2.19.1.orig/shlibs/mount/src/context_umount.c
-+++ util-linux-2.19.1/shlibs/mount/src/context_umount.c
+diff --git a/shlibs/mount/src/context_umount.c b/shlibs/mount/src/context_umount.c
+index 69819e5..f7678a6 100644
+--- a/shlibs/mount/src/context_umount.c
++++ b/shlibs/mount/src/context_umount.c
@@ -49,6 +49,34 @@ umount2(const char *path, int flags) {
#endif
diff --git a/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch b/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch
index 437b29c69..724f2cbb9 100644
--- a/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch
+++ b/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch
@@ -11,15 +11,19 @@ In file included from ../include/writeall.h:7,
Signed-off-by: Jon Ringle <jon@ringle.org>
---
- disk-utils/swaplabel.c | 2 +-
- lib/tt.c | 1 +
- shlibs/mount/src/cache.c | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
+ disk-utils/swaplabel.c | 2 +-
+ lib/at.c | 1 +
+ lib/tt.c | 1 +
+ shlibs/mount/src/cache.c | 3 ++-
+ shlibs/mount/src/iter.c | 1 +
+ shlibs/mount/src/mountP.h | 1 -
+ shlibs/mount/src/tab_parse.c | 1 +
+ 7 files changed, 7 insertions(+), 3 deletions(-)
-Index: util-linux-2.19.1/disk-utils/swaplabel.c
-===================================================================
---- util-linux-2.19.1.orig/disk-utils/swaplabel.c
-+++ util-linux-2.19.1/disk-utils/swaplabel.c
+diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
+index 9dc20b4..28990a7 100644
+--- a/disk-utils/swaplabel.c
++++ b/disk-utils/swaplabel.c
@@ -30,8 +30,8 @@
# endif
#endif
@@ -30,10 +34,22 @@ Index: util-linux-2.19.1/disk-utils/swaplabel.c
#include "swapheader.h"
#include "strutils.h"
#include "nls.h"
-Index: util-linux-2.19.1/lib/tt.c
-===================================================================
---- util-linux-2.19.1.orig/lib/tt.c
-+++ util-linux-2.19.1/lib/tt.c
+diff --git a/lib/at.c b/lib/at.c
+index 1993f99..3731a23 100644
+--- a/lib/at.c
++++ b/lib/at.c
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <errno.h>
+
+ #include "at.h"
+
+diff --git a/lib/tt.c b/lib/tt.c
+index aa93bf5..79cc3d9 100644
+--- a/lib/tt.c
++++ b/lib/tt.c
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <string.h>
@@ -42,13 +58,15 @@ Index: util-linux-2.19.1/lib/tt.c
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
-Index: util-linux-2.19.1/shlibs/mount/src/cache.c
-===================================================================
---- util-linux-2.19.1.orig/shlibs/mount/src/cache.c
-+++ util-linux-2.19.1/shlibs/mount/src/cache.c
-@@ -25,8 +25,8 @@
+diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
+index 18b6cd4..f50e7dc 100644
+--- a/shlibs/mount/src/cache.c
++++ b/shlibs/mount/src/cache.c
+@@ -24,9 +24,10 @@
+ #include <unistd.h>
#include <fcntl.h>
#include <blkid.h>
++#include <errno.h>
-#include "canonicalize.h"
#include "mountP.h"
@@ -56,3 +74,39 @@ Index: util-linux-2.19.1/shlibs/mount/src/cache.c
/*
* Canonicalized (resolved) paths & tags cache
+diff --git a/shlibs/mount/src/iter.c b/shlibs/mount/src/iter.c
+index 99fedd1..9cc1dee 100644
+--- a/shlibs/mount/src/iter.c
++++ b/shlibs/mount/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/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h
+index fa01bd5..35fd70f 100644
+--- a/shlibs/mount/src/mountP.h
++++ b/shlibs/mount/src/mountP.h
+@@ -11,7 +11,6 @@
+ #define _LIBMOUNT_PRIVATE_H
+
+ #include <sys/types.h>
+-#include <errno.h>
+ #include "c.h"
+
+ #define USE_UNSTABLE_LIBMOUNT_API
+diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
+index e285c65..2fb37b7 100644
+--- a/shlibs/mount/src/tab_parse.c
++++ b/shlibs/mount/src/tab_parse.c
+@@ -14,6 +14,7 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <errno.h>
+
+ #include "nls.h"
+ #include "at.h"
diff --git a/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch b/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch
index c1cc33047..62ba3ac6e 100644
--- a/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch
+++ b/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch
@@ -12,13 +12,13 @@ tt.c:508: error: '_s' undeclared (first use in this function)
Signed-off-by: Jon Ringle <jon@ringle.org>
---
lib/tt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
-Index: util-linux-2.19.1/lib/tt.c
-===================================================================
---- util-linux-2.19.1.orig/lib/tt.c
-+++ util-linux-2.19.1/lib/tt.c
-@@ -52,7 +52,7 @@ static const struct tt_symbols utf8_tt_s
+diff --git a/lib/tt.c b/lib/tt.c
+index 79cc3d9..a64c83c 100644
+--- a/lib/tt.c
++++ b/lib/tt.c
+@@ -52,7 +52,7 @@ static const struct tt_symbols utf8_tt_symbols = {
};
#else /* !HAVE_WIDECHAR */
diff --git a/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch b/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch
index 69a030d7e..4df7a125b 100644
--- a/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch
+++ b/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch
@@ -8,13 +8,13 @@ replace with strchr
Signed-off-by: Jon Ringle <jon@ringle.org>
---
shlibs/mount/src/tab_parse.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 files changed, 2 insertions(+), 2 deletions(-)
-Index: util-linux-2.19.1/shlibs/mount/src/tab_parse.c
-===================================================================
---- util-linux-2.19.1.orig/shlibs/mount/src/tab_parse.c
-+++ util-linux-2.19.1/shlibs/mount/src/tab_parse.c
-@@ -285,14 +285,14 @@ static int mnt_table_parse_next(struct l
+diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
+index 2fb37b7..bd76c18 100644
+--- a/shlibs/mount/src/tab_parse.c
++++ b/shlibs/mount/src/tab_parse.c
+@@ -286,14 +286,14 @@ static int mnt_table_parse_next(struct libmnt_table *tb, FILE *f, struct libmnt_
if (fgets(buf, sizeof(buf), f) == NULL)
return -EINVAL;
++*nlines;
diff --git a/patches/util-linux-2.19.1/series b/patches/util-linux-2.19.1/series
index 49575fa76..9fd3f6f92 100644
--- a/patches/util-linux-2.19.1/series
+++ b/patches/util-linux-2.19.1/series
@@ -1,6 +1,7 @@
# generated by git-ptx-patches
+#tag:base --start-number 1
0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
0002-__progname-redefinition-fix.patch
0003-_s-undeclared-fix.patch
0004-replace-index-with-strchr.patch
-# 46107b4447bfd6ffdcda93e37657e575 - git-ptx-patches magic
+# b65ec9e159027bf7fdcbd29dd04b3d78 - git-ptx-patches magic