Convert the rest of packages to new framework

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

8 files changed, 0 insertions, 611 deletions

diff --git a/patches/uClibc/0.9.33.2/100-m68k-ice.patch b/patches/uClibc/0.9.33.2/100-m68k-ice.patch
deleted file mode 100644
index 410f8d6..0000000
--- a/patches/uClibc/0.9.33.2/100-m68k-ice.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-@@ -226,6 +226,7 @@
- 
- OPTIMIZATION:=
- # Use '-Os' optimization if available, else use -O2, allow Config to override
-+ifneq ($(TARGET_ARCH),m68k)
- $(eval $(call check-gcc-var,-Os))
- ifneq ($(CFLAG_-Os),)
- OPTIMIZATION += $(CFLAG_-Os)
-@@ -233,6 +234,7 @@
- $(eval $(call check-gcc-var,-O2))
- OPTIMIZATION += $(CFLAG_-O2)
- endif
-+endif
- # Use the gcc 3.4 -funit-at-a-time optimization when available
- $(eval $(call check-gcc-var,-funit-at-a-time))
- OPTIMIZATION += $(CFLAG_-funit-at-a-time)
diff --git a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
deleted file mode 100644
index 0381ba8..0000000
--- a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 1 Oct 2012 18:12:54 +1300
-Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
-
-Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
-exported header files were updated to use these new types. Add the
-definitions for __kernel_long_t and __kernel_ulong_t to the relevant
-kernel_types.h headers.
-
-This change was automated with the following scriptlet
-
-  git grep --name-only 'typedef.*__kernel_old_dev_t' \
-    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
-  typedef long\t\t__kernel_long_t;\
-  typedef unsigned long\t__kernel_ulong_t;'
-
-Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
-Here's a cleaned up patch which should get the whitespace right. I'm a
-bit iffy about the sparc changes they make sense to me but it's not a
-platform I have access to.
-
-I can break this up per arch or per maintainer if requested.
-
- 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(+)
-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 ++
- 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;
- typedef __kernel_uid_t __kernel_uid32_t;
- typedef __kernel_gid_t __kernel_gid32_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- 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;
- typedef unsigned short		__kernel_old_gid_t;
- typedef long long		__kernel_loff_t;
- typedef __kernel_dev_t		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- 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;
- typedef unsigned short		__kernel_old_uid_t;
- typedef unsigned short		__kernel_old_gid_t;
- typedef unsigned short		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- #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;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- 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;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- #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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- 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;
- typedef unsigned long long	__kernel_ino64_t;
- 
- typedef unsigned int		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- 
- typedef unsigned int	__kernel_dev_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+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;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- 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;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- #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;
- typedef __kernel_uid_t	__kernel_old_uid_t;
- typedef __kernel_gid_t	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long      __kernel_loff_t;
- #else
- typedef unsigned int	__kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
- typedef __kernel_uid_t	__kernel_old_uid_t;
- typedef __kernel_gid_t	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef unsigned short	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- #else
- typedef unsigned int	__kernel_dev_t;
- typedef unsigned int	__kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef __kernel_uid_t 	       __kernel_old_uid_t;
- typedef __kernel_gid_t         __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- 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;
- typedef unsigned short	       __kernel_old_uid_t;
- typedef unsigned short	       __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef unsigned short	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 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/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch b/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch
deleted file mode 100644
index 884307d..0000000
--- a/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/
- #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))
- 
--size_t strlcpy(char *dst, const char *src, size_t siz);
--
- /* types of input lines: */
- typedef enum {
- 	LT_TRUEI,		/* a true #if with ignore flag */
diff --git a/patches/uClibc/0.9.33.2/400-arm-unwind.patch b/patches/uClibc/0.9.33.2/400-arm-unwind.patch
deleted file mode 100644
index d31844c..0000000
--- a/patches/uClibc/0.9.33.2/400-arm-unwind.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 16884562bf54a93e76c6d2ba03edb1fb00e8b3e0
-Author: Alexey Neyman <stilor@att.net>
-Date:   Thu Oct 1 13:22:37 2015 -0700
-
-    Mark libgcc_c_resume as used.
-    
-    Recent GCC releases eliminate the data that is only set and never read,
-    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
---- 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 @@
- #define __libc_dlclose          dlclose
- #define __libc_fatal(x)         {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
diff --git a/patches/uClibc/0.9.33.2/500-no-install-D.patch b/patches/uClibc/0.9.33.2/500-no-install-D.patch
deleted file mode 100644
index f8c2cc1..0000000
--- a/patches/uClibc/0.9.33.2/500-no-install-D.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
-@@ -118,15 +118,22 @@
- install-y += utils_install
- 
- # This installs both utils and hostutils, so doesn't depend on either.
-+$(PREFIX)$(DEVEL_PREFIX)bin $(PREFIX)$(RUNTIME_PREFIX)sbin:
-+	$(do_mkdir)
-+
-+utils_install: $(PREFIX)$(DEVEL_PREFIX)bin
-+ifeq ($(HAVE_SHARED),y)
-+utils_install: $(PREFIX)$(RUNTIME_PREFIX)sbin
-+endif
- 
- utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ))
--	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
-+	$(Q)$(INSTALL) -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
- ifeq ($(HAVE_SHARED),y)
--	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
--	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
-+	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
-+	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
- endif
- ifeq ($(UCLIBC_HAS_LOCALE),y)
--	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
-+	$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
- 	#$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
- endif
- 
diff --git a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch b/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
deleted file mode 100644
index 677c599..0000000
--- a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
- 		}
- 	}
- #endif
-+
-+#ifdef LDSO_MULTILIB_DIR
-+	/* If multilib directory is selected, search it before falling back to
-+	   standard lib directories. */
-+	_dl_if_debug_dprint("\tsearching multilib lib path list\n");
-+	tpnt1 = search_for_named_library(libname, rflags,
-+					UCLIBC_RUNTIME_PREFIX LDSO_MULTILIB_DIR ":"
-+					UCLIBC_RUNTIME_PREFIX "usr" LDSO_MULTILIB_DIR,
-+					rpnt);
-+	if (tpnt1 != NULL)
-+		return tpnt1;
-+#endif
-+
- #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
- 
- CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" $(CFLAGS-ldso)
- 
-+# Search non-default multilib directories
-+ifneq ($(MULTILIB_DIR),lib)
-+CFLAGS-ldso.c	+= -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\"
-+endif
-+
- LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-$(UCLIBC_LDSO_NAME).so := -Wl,--dsbt-index=1
- ifneq ($(SUPPORT_LD_DEBUG),y)
- LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS)
diff --git a/patches/uClibc/0.9.33.2/998-dlopen-static.patch b/patches/uClibc/0.9.33.2/998-dlopen-static.patch
deleted file mode 100644
index 9d2fa55..0000000
--- a/patches/uClibc/0.9.33.2/998-dlopen-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 231e4a9b4b972662a6832f714a05525a3754892d Mon Sep 17 00:00:00 2001
-From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
-Date: Thu, 9 May 2013 09:04:20 +0200
-Subject: libdl: fix dlopen implementation from statically linked application
-
-Calling dlopen from statically linked application is actually broken,
-because _dl_find_hash enters into an infinite loop when trying to
-resolve symbols. In this case it doesn't need to extend the global
-scope, it is readyto be used as it is, because _dl_loaded_modules already points
-to the dlopened library.
-
-The patch also fixesi a typo in __LDSO_LD_LIBRARY_PATH__ macro, that was
-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 +++++++++--
- 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)
- 	if (getenv("LD_BIND_NOW"))
- 		now_flag = RTLD_NOW;
- 
--#if !defined SHARED && defined __LDSO_LIBRARY_PATH__
-+#if !defined SHARED && defined __LDSO_LD_LIBRARY_PATH__
- 	/* 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)
- 	 * to the GOT tables.  We need to do this in reverse order so that COPY
- 	 * directives work correctly */
- 
--	/* Get the tail of the list */
-+#ifdef SHARED
-+	/*
-+	 * Get the tail of the list.
-+	 * In the static case doesn't need to extend the global scope, it is
-+	 * ready to be used as it is, because _dl_loaded_modules already points
-+	 * to the dlopened library.
-+	 */
- 	for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next);
- 
- 	/* Extend the global scope by adding the local scope of the dlopened DSO. */
- 	ls->next = &dyn_chain->dyn->symbol_scope;
-+#endif
- #ifdef __mips__
- 	/*
- 	 * Relocation of the GOT entries for MIPS have to be done
--- 
-cgit v0.12
-
diff --git a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch b/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch
deleted file mode 100644
index 8bc87ec..0000000
--- a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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)
- 	const char *name;
- 	const char *configname = conf_get_configname();
- 	struct stat tmpstat;
-+	int olddefconfig = 0;
- 
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -451,6 +452,7 @@ int main(int ac, char **av)
- 			break;
- 		case 'd':
- 			input_mode = set_default;
-+			olddefconfig = 1;
- 			break;
- 		case 'D':
- 			input_mode = set_default;
-@@ -514,7 +516,7 @@ int main(int ac, char **av)
- 	switch (input_mode) {
- 	case set_default:
- 		if (!defconfig_file)
--			defconfig_file = conf_get_default_confname();
-+			defconfig_file = olddefconfig ? NULL : conf_get_default_confname();
- 		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)
- allnoconfig: $(conf)
- 	$(Q)$< -n extra/Configs/Config.in
- 
-+olddefconfig: $(conf)
-+	$(Q)$< -d extra/Configs/Config.in
-+
- defconfig: $(conf)
- 	$(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in
-