Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

8 files changed, 98 insertions, 132 deletions

diff --git a/packages/uClibc/0.9.33.2/100-m68k-ice.patch b/packages/uClibc/0.9.33.2/0000-m68k-ice.patch
index 410f8d6..4f228f0 100644
--- a/packages/uClibc/0.9.33.2/100-m68k-ice.patch
+++ b/packages/uClibc/0.9.33.2/0000-m68k-ice.patch
@@ -1,6 +1,9 @@
-diff -urN uClibc-0.9.33.2~orig/Rules.mak uClibc-0.9.33.2/Rules.mak
---- uClibc-0.9.33.2~orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-09-24 14:09:51.092953729 +0200
+---
+ Rules.mak |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Rules.mak
++++ b/Rules.mak
 @@ -226,6 +226,7 @@
  
  OPTIMIZATION:=
diff --git a/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/packages/uClibc/0.9.33.2/0001-fix-kernel-3.4plus-build.patch
index 0381ba8..8c02399 100644
--- a/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ b/packages/uClibc/0.9.33.2/0001-fix-kernel-3.4plus-build.patch
@@ -52,35 +52,33 @@ Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
  22 files changed, 50 insertions(+)
 
-diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-index d5574c9..cd59b9d 100644
 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
+@@ -33,6 +33,8 @@
  typedef __kernel_uid_t __kernel_uid32_t;
  typedef __kernel_gid_t __kernel_gid32_t;
  typedef __kernel_dev_t __kernel_old_dev_t;
@@ -89,11 +87,9 @@ index d5574c9..cd59b9d 100644
  
  typedef struct {
  	int val[2];
-diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
-index 766a306..6b36f32 100644
 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short		__kernel_old_gid_t;
  typedef long long		__kernel_loff_t;
  typedef __kernel_dev_t		__kernel_old_dev_t;
@@ -102,11 +98,9 @@ index 766a306..6b36f32 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-index f7d8b52..c551d57 100644
 --- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+@@ -39,6 +39,8 @@
  typedef unsigned short		__kernel_old_uid_t;
  typedef unsigned short		__kernel_old_gid_t;
  typedef unsigned short		__kernel_old_dev_t;
@@ -115,11 +109,9 @@ index f7d8b52..c551d57 100644
  
  #ifdef __GNUC__
  typedef long long		__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-index d69a875..9fec595 100644
 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -128,11 +120,9 @@ index d69a875..9fec595 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-index 7557309..2c363a8 100644
 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -22,6 +22,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -141,11 +131,9 @@ index 7557309..2c363a8 100644
  typedef unsigned int	__kernel_size_t;
  typedef int		__kernel_ssize_t;
  typedef int		__kernel_ptrdiff_t;
-diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
-index f122c7f..5d31f7b 100644
 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
-@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
+@@ -28,6 +28,8 @@
  typedef unsigned short  __kernel_old_uid_t;
  typedef unsigned short  __kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -154,11 +142,9 @@ index f122c7f..5d31f7b 100644
  
  #ifdef __GNUC__
  typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
-index 8017d85..f55a129 100644
 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -31,6 +31,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -167,11 +153,9 @@ index 8017d85..f55a129 100644
  typedef long long	__kernel_loff_t;
  
  /*
-diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-index 0570675..4cfd1bf 100644
 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -180,11 +164,9 @@ index 0570675..4cfd1bf 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-index 4441f9b..6b2e794 100644
 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
+@@ -45,6 +45,8 @@
  typedef unsigned long long	__kernel_ino64_t;
  
  typedef unsigned int		__kernel_old_dev_t;
@@ -193,11 +175,9 @@ index 4441f9b..6b2e794 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
-index 9c07c72..59044b8 100644
 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -40,6 +40,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -206,11 +186,9 @@ index 9c07c72..59044b8 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-index c8ef86d..e31dc65 100644
 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+@@ -52,5 +52,7 @@
  
  typedef unsigned int	__kernel_dev_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -218,11 +196,9 @@ index c8ef86d..e31dc65 100644
 +typedef unsigned long	__kernel_ulong_t;
  
  #endif /* _ASM_IA64_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-index 0a77a8f..176b968 100644
 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -231,11 +207,9 @@ index 0a77a8f..176b968 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-index 2a70575..a9f736b 100644
 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -44,6 +44,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -244,11 +218,9 @@ index 2a70575..a9f736b 100644
  
  #ifdef __GNUC__
  typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
-index 9fc3b96..97faeac 100644
 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
+@@ -32,6 +32,8 @@
  typedef __kernel_uid_t	__kernel_old_uid_t;
  typedef __kernel_gid_t	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -257,7 +229,7 @@ index 9fc3b96..97faeac 100644
  typedef long long      __kernel_loff_t;
  #else
  typedef unsigned int	__kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
+@@ -68,6 +70,8 @@
  typedef __kernel_uid_t	__kernel_old_uid_t;
  typedef __kernel_gid_t	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -266,11 +238,9 @@ index 9fc3b96..97faeac 100644
  typedef long long      __kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-index 8b86d79..3c030e7 100644
 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -31,6 +31,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef unsigned short	__kernel_old_dev_t;
@@ -279,11 +249,9 @@ index 8b86d79..3c030e7 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-index 3f3b933..1167de2 100644
 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -36,6 +36,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -292,7 +260,7 @@ index 3f3b933..1167de2 100644
  #else
  typedef unsigned int	__kernel_dev_t;
  typedef unsigned int	__kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -61,6 +63,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -301,11 +269,9 @@ index 3f3b933..1167de2 100644
  typedef long long	__kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
-index f96e9fa..ac97261 100644
 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -314,11 +280,9 @@ index f96e9fa..ac97261 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-index 671cc83..8cc6c61 100644
 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
+@@ -43,6 +43,8 @@
  typedef unsigned short  __kernel_old_uid_t;
  typedef unsigned short  __kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -327,11 +291,9 @@ index 671cc83..8cc6c61 100644
  typedef long long       __kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-index 0cc4bc2..a10e075 100644
 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
+@@ -32,6 +32,8 @@
  typedef __kernel_uid_t 	       __kernel_old_uid_t;
  typedef __kernel_gid_t         __kernel_old_gid_t;
  typedef __kernel_dev_t         __kernel_old_dev_t;
@@ -340,7 +302,7 @@ index 0cc4bc2..a10e075 100644
  typedef __kernel_uid_t	       __kernel_uid32_t;
  typedef __kernel_gid_t	       __kernel_gid32_t;
  typedef int		       __kernel_suseconds_t;
-@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
+@@ -62,6 +64,8 @@
  typedef unsigned short	       __kernel_old_uid_t;
  typedef unsigned short	       __kernel_old_gid_t;
  typedef __kernel_dev_t         __kernel_old_dev_t;
@@ -349,11 +311,9 @@ index 0cc4bc2..a10e075 100644
  typedef long long              __kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
-index 3e851ab..780aa8a 100644
 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
-@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -41,6 +41,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -362,11 +322,9 @@ index 3e851ab..780aa8a 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-index de800d7..0cae08c 100644
 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -40,6 +40,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -375,11 +333,9 @@ index de800d7..0cae08c 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-index 44f1075..ed38f2e 100644
 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -33,6 +33,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef unsigned short	__kernel_old_dev_t;
@@ -388,6 +344,3 @@ index 44f1075..ed38f2e 100644
  typedef long long	__kernel_loff_t;
  
  /* Beginning in 2.6 kernels, which is the first version that includes the
--- 
-1.8.1.2
-
diff --git a/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch b/packages/uClibc/0.9.33.2/0002-fix-darwin-build.patch
index 884307d..666219c 100644
--- a/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch
+++ b/packages/uClibc/0.9.33.2/0002-fix-darwin-build.patch
@@ -1,7 +1,10 @@
-diff -Nrupa uClibc-0.9.33.2.orig/extra/scripts/unifdef.c uClibc-0.9.33.2/extra/scripts/unifdef.c
---- uClibc-0.9.33.2.orig/extra/scripts/unifdef.c	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/scripts/unifdef.c	2014-10-25 17:07:33.000000000 +0200
-@@ -78,8 +78,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/
+---
+ extra/scripts/unifdef.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/extra/scripts/unifdef.c
++++ b/extra/scripts/unifdef.c
+@@ -78,8 +78,6 @@
  #define errx(exit_code, fmt, args...) ({ warnx(fmt, ## args); exit(exit_code); })
  #define err(exit_code, fmt, args...)  errx(exit_code, fmt ": %s", ## args, strerror(errno))
  
diff --git a/packages/uClibc/0.9.33.2/400-arm-unwind.patch b/packages/uClibc/0.9.33.2/0003-arm-unwind.patch
index d31844c..2635bdd 100644
--- a/packages/uClibc/0.9.33.2/400-arm-unwind.patch
+++ b/packages/uClibc/0.9.33.2/0003-arm-unwind.patch
@@ -8,11 +8,13 @@ Date:   Thu Oct 1 13:22:37 2015 -0700
     along with the code storing to that data. For assembly blocks like in
     ARM unwind code, the data structures need to be declared used.
 
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index f9a4ffb..f0c3047 100644
+---
+ libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  #define __libc_dlclose          dlclose
  #define __libc_fatal(x)         {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
  
diff --git a/packages/uClibc/0.9.33.2/500-no-install-D.patch b/packages/uClibc/0.9.33.2/0004-no-install-D.patch
index f8c2cc1..35968bf 100644
--- a/packages/uClibc/0.9.33.2/500-no-install-D.patch
+++ b/packages/uClibc/0.9.33.2/0004-no-install-D.patch
@@ -1,5 +1,9 @@
---- uClibc-0.9.33.2.orig/utils/Makefile.in	2012-05-15 00:20:09.000000000 -0700
-+++ uClibc-0.9.33.2/utils/Makefile.in	2017-03-01 12:17:56.000000000 -0800
+---
+ utils/Makefile.in |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/utils/Makefile.in
++++ b/utils/Makefile.in
 @@ -118,15 +118,22 @@
  install-y += utils_install
  
diff --git a/packages/uClibc/0.9.33.2/600-prefer-multilib.patch b/packages/uClibc/0.9.33.2/0005-prefer-multilib.patch
index 677c599..286e562 100644
--- a/packages/uClibc/0.9.33.2/600-prefer-multilib.patch
+++ b/packages/uClibc/0.9.33.2/0005-prefer-multilib.patch
@@ -1,7 +1,11 @@
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c uClibc-0.9.33.2/ldso/ldso/dl-elf.c
---- uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c	2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/dl-elf.c	2017-03-14 23:42:19.308005691 -0700
-@@ -284,6 +284,19 @@ struct elf_resolve *_dl_load_shared_libr
+---
+ ldso/ldso/Makefile.in |    5 +++++
+ ldso/ldso/dl-elf.c    |   13 +++++++++++++
+ 2 files changed, 18 insertions(+)
+
+--- a/ldso/ldso/dl-elf.c
++++ b/ldso/ldso/dl-elf.c
+@@ -284,6 +284,19 @@
  		}
  	}
  #endif
@@ -21,10 +25,9 @@ diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c uClibc-0.9.33.2/ldso/ldso/dl-
  #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
  	/* Look for libraries wherever the shared library loader
  	 * was installed */
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in uClibc-0.9.33.2/ldso/ldso/Makefile.in
---- uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in	2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/Makefile.in	2017-03-14 23:41:45.215634328 -0700
-@@ -30,6 +30,11 @@ CFLAGS-ldso/ldso/$(TARGET_ARCH)/ := $(CF
+--- a/ldso/ldso/Makefile.in
++++ b/ldso/ldso/Makefile.in
+@@ -30,6 +30,11 @@
  
  CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" $(CFLAGS-ldso)
  
diff --git a/packages/uClibc/0.9.33.2/998-dlopen-static.patch b/packages/uClibc/0.9.33.2/0006-dlopen-static.patch
index 9d2fa55..6699180 100644
--- a/packages/uClibc/0.9.33.2/998-dlopen-static.patch
+++ b/packages/uClibc/0.9.33.2/0006-dlopen-static.patch
@@ -15,14 +15,12 @@ preventing to get the actual value of the LD_LIBRARY_PATH.
 Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
 Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
 ---
- ldso/libdl/libdl.c | 11 +++++++++--
+ ldso/libdl/libdl.c |   11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 4630a59..3a78696 100644
 --- a/ldso/libdl/libdl.c
 +++ b/ldso/libdl/libdl.c
-@@ -374,7 +374,7 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+@@ -377,7 +377,7 @@
  	if (getenv("LD_BIND_NOW"))
  		now_flag = RTLD_NOW;
  
@@ -31,7 +29,7 @@ index 4630a59..3a78696 100644
  	/* When statically linked, the _dl_library_path is not yet initialized */
  	_dl_library_path = getenv("LD_LIBRARY_PATH");
  #endif
-@@ -541,11 +541,18 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+@@ -544,11 +544,18 @@
  	 * to the GOT tables.  We need to do this in reverse order so that COPY
  	 * directives work correctly */
  
@@ -51,6 +49,3 @@ index 4630a59..3a78696 100644
  #ifdef __mips__
  	/*
  	 * Relocation of the GOT entries for MIPS have to be done
--- 
-cgit v0.12
-
diff --git a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch b/packages/uClibc/0.9.33.2/0007-make-olddefconfig.patch
index 8bc87ec..9c8a535 100644
--- a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch
+++ b/packages/uClibc/0.9.33.2/0007-make-olddefconfig.patch
@@ -1,7 +1,11 @@
-diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config/conf.c
---- uClibc-0.9.33.2.orig/extra/config/conf.c	2017-02-04 12:57:38.488808014 -0800
-+++ uClibc-0.9.33.2/extra/config/conf.c	2017-02-04 20:26:28.613244457 -0800
-@@ -435,6 +435,7 @@ int main(int ac, char **av)
+---
+ Makefile.in         |    3 +++
+ extra/config/conf.c |    4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/extra/config/conf.c
++++ b/extra/config/conf.c
+@@ -435,6 +435,7 @@
  	const char *name;
  	const char *configname = conf_get_configname();
  	struct stat tmpstat;
@@ -9,7 +13,7 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  
  	setlocale(LC_ALL, "");
  	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -451,6 +452,7 @@ int main(int ac, char **av)
+@@ -451,6 +452,7 @@
  			break;
  		case 'd':
  			input_mode = set_default;
@@ -17,7 +21,7 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  			break;
  		case 'D':
  			input_mode = set_default;
-@@ -514,7 +516,7 @@ int main(int ac, char **av)
+@@ -514,7 +516,7 @@
  	switch (input_mode) {
  	case set_default:
  		if (!defconfig_file)
@@ -26,10 +30,9 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  		if (conf_read(defconfig_file)) {
  			printf(_("***\n"
  				"*** Can't find default configuration \"%s\"!\n"
-diff -urpN uClibc-0.9.33.2.orig/Makefile.in uClibc-0.9.33.2/Makefile.in
---- uClibc-0.9.33.2.orig/Makefile.in	2017-02-04 12:57:38.484807980 -0800
-+++ uClibc-0.9.33.2/Makefile.in	2017-02-04 12:59:34.625789324 -0800
-@@ -460,6 +460,9 @@ allyesconfig: $(conf)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -460,6 +460,9 @@
  allnoconfig: $(conf)
  	$(Q)$< -n extra/Configs/Config.in