klibc: major patch split and reordering, recipe cleaning.

* update order of patches to include upstream changes
* bump PR for all three recipes
* fix typo in klibc_1.5 about 'sh'
* clean tabs

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

4 files changed, 0 insertions, 134 deletions

diff --git a/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch
deleted file mode 100644
index 6eb604e45c..0000000000
--- a/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: klibc-1.5/usr/kinit/fstype/fstype.c
-===================================================================
---- klibc-1.5.orig/usr/kinit/fstype/fstype.c	2008-02-28 00:48:35.319254938 +0100
-+++ klibc-1.5/usr/kinit/fstype/fstype.c	2008-02-28 00:52:20.583257793 +0100
-@@ -20,7 +20,7 @@
- #include <netinet/in.h>
- #include <sys/utsname.h>
- #include <sys/vfs.h>
--
-+#include <linux/types.h>
- #define cpu_to_be32(x) __cpu_to_be32(x)	/* Needed by romfs_fs.h */
- 
- #include "romfs_fs.h"
-@@ -37,6 +37,12 @@
- #include "ocfs2_fs.h"
- #include "nilfs_fs.h"
- 
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#include <linux/byteorder/big_endian.h>
-+#else
-+#include <linux/byteorder/little_endian.h>
-+#endif
-+
- /*
-  * Slightly cleaned up version of jfs_superblock to
-  * avoid pulling in other kernel header files.
-@@ -59,6 +65,27 @@
- /* Swap needs the definition of block size */
- #include "swap_fs.h"
- 
-+static int jffs2_image(const unsigned char *buf, unsigned long *blocks)
-+{
-+       // Very sloppy! ;-E
-+       if (*buf == 0x85 && buf[1] == 0x19)
-+               return 1;
-+
-+       return 0;
-+}
-+
-+static int vfat_image(const unsigned char *buf, unsigned long *blocks)
-+{
-+        const struct romfs_super_block *sb =
-+               (const struct romfs_super_block *)buf;
-+       if (!strncmp(buf + 54, "FAT12   ", 8)
-+           || !strncmp(buf + 54, "FAT16   ", 8)
-+           || !strncmp(buf + 82, "FAT32   ", 8))
-+               return 1;
-+
-+       return 0;
-+}
-+
- static int gzip_image(const void *buf, unsigned long long *bytes)
- {277 304
- 	const unsigned char *p = buf;
-@@ -490,6 +517,8 @@
- 	{1, "ext3", ext3_image},
- 	{1, "ext2", ext2_image},
- 	{1, "minix", minix_image},
-+	{0, "jffs2", jffs2_image},
-+	{0, "vfat", vfat_image},
-	{1, "nilfs2", nilfs2_image},
-	{2, "ocfs2", ocfs2_image},
- 	{8, "reiserfs", reiserfs_image},
diff --git a/recipes/klibc/klibc-1.5.15/isystem.patch b/recipes/klibc/klibc-1.5.15/isystem.patch
deleted file mode 100644
index 2ec40c16c2..0000000000
--- a/recipes/klibc/klibc-1.5.15/isystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: klibc-1.5.15/klcc/klcc.in
-===================================================================
---- klibc-1.5.15.orig/klcc/klcc.in	2009-12-14 00:32:41.373661102 +0100
-+++ klibc-1.5.15/klcc/klcc.in	2009-12-14 00:34:20.855735356 +0100
-@@ -147,7 +147,7 @@
-     } elsif ( $a =~ /^-([fmwWQdO]|std=|ansi|pedantic|M[GPD]|MMD)/ ) {
- 	# Options to gcc
- 	push(@ccopt, $a);
--    } elsif ( $a =~ /^-([DUI]|M[FQT])(.*)$/ ) {
-+    } elsif ( $a =~ /^-([DUI]|M[FQT]|isystem)(.*)$/ ) {
- 	# Options to gcc, which can take either a conjoined argument
- 	# (-DFOO) or a disjoint argument (-D FOO)
- 	push(@ccopt, $a);
diff --git a/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch
deleted file mode 100644
index eea606be2b..0000000000
--- a/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: MNTPROC_MNT and MNTPROC_UMNT are no longer defined by the
- kernel. Hack around this by restoring the old definitions.
-Upstream: http://thread.gmane.org/gmane.linux.nfs/28059 suggests a better
- fix is in progress.
-
-diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/kinit/nfsmount/mount.c klibc-1.5.15.new/usr/kinit/nfsmount/mount.c
---- klibc-1.5.15/usr/kinit/nfsmount/mount.c	2009-01-04 19:28:03.000000000 +0000
-+++ klibc-1.5.15.new/usr/kinit/nfsmount/mount.c	2009-10-04 22:52:44.000000000 +0100
-@@ -44,6 +44,11 @@
- 
- #define MNT_REPLY_MINSIZE (sizeof(struct rpc_reply) + sizeof(uint32_t))
- 
-+#ifndef MNTPROC_MNT
-+#  define MNTPROC_MNT	1
-+#  define MNTPROC_UMNT	3
-+#endif /* MNTPROC_MNT */
-+
- static int get_ports(uint32_t server, const struct nfs_mount_data *data)
- {
- 	uint32_t nfs_ver, mount_ver;
diff --git a/recipes/klibc/klibc-1.5.15/signal-cleanup.patch b/recipes/klibc/klibc-1.5.15/signal-cleanup.patch
deleted file mode 100644
index c64cd5bbb6..0000000000
--- a/recipes/klibc/klibc-1.5.15/signal-cleanup.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Cope with header changes in kernel commit
- 63b852a6b67d0820d388b0ecd0da83ccb4048b8d.
-
-Index: klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h
-===================================================================
---- klibc-1.5.15.orig/usr/include/arch/i386/klibc/archsignal.h	2009-01-04 11:28:03.000000000 -0800
-+++ klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h	2009-11-11 14:21:10.000000000 -0800
-@@ -96,7 +96,12 @@ typedef struct {
- #define MINSIGSTKSZ	2048
- #define SIGSTKSZ	8192
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
-+#include <asm-generic/signal-defs.h>
-+#else
- #include <asm-generic/signal.h>
-+#endif
- 
- /* This uses gcc anonymous union support... */
- struct siginfo;
-Index: klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h
-===================================================================
---- klibc-1.5.15.orig/usr/include/arch/sparc/klibc/archsignal.h	2009-01-04 11:28:03.000000000 -0800
-+++ klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h	2009-11-09 15:06:29.000000000 -0800
-@@ -11,13 +11,6 @@
- #define __WANT_POSIX1B_SIGNALS__
- #include <asm/signal.h>
- 
--struct sigaction {
--	__sighandler_t	sa_handler;
--	unsigned long	sa_flags;
--	void		(*sa_restorer)(void);	/* Not used by Linux/SPARC */
--	sigset_t	sa_mask;
--};
--
- /* Not actually used by the kernel... */
- #define SA_RESTORER	0x80000000
-