klibc: major clean out of intermediate recipes.

* keep klibc_1.5 (first prototype)
* keep up-to-date klibc_1.5.18 patched to compile with 2.6.2x and 2.6.3x
* runtime tested on armv5te

4 files changed, 0 insertions, 226 deletions

diff --git a/recipes/klibc/files/dash_readopt.patch b/recipes/klibc/files/dash_readopt.patch
deleted file mode 100644
index 49bc087edd..0000000000
--- a/recipes/klibc/files/dash_readopt.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: klibc-1.5/usr/dash/miscbltin.c
-===================================================================
---- klibc-1.5.orig/usr/dash/miscbltin.c	2008-03-27 20:38:09.354564817 +0100
-+++ klibc-1.5/usr/dash/miscbltin.c	2008-04-04 18:05:32.063364195 +0200
-@@ -46,6 +46,7 @@
- #include <ctype.h>
- #include <stdint.h>
- #include <time.h>		/* strtotimeval() */
-+#include <termios.h>
- 
- #include "shell.h"
- #include "options.h"
-@@ -83,6 +84,11 @@
- 	int timeout;
- 	int i;
- 	fd_set set;
-+	int n_flag = 0;
-+	unsigned int nchars = 0;
-+	int silent = 0;
-+	struct termios tty, old_tty;
-+
- 	struct timeval ts, t0, t1, to;
- 
- 	ts.tv_sec = ts.tv_usec = 0;
-@@ -90,11 +96,18 @@
- 	rflag = 0;
- 	timeout = 0;
- 	prompt = NULL;
--	while ((i = nextopt("p:rt:")) != '\0') {
-+	while ((i = nextopt("p:rt:n:s")) != '\0') {
- 		switch(i) {
- 		case 'p':
- 			prompt = optionarg;
- 			break;
-+		case 'n':
-+			nchars = strtoul(optionarg, NULL, 10);
-+			n_flag = nchars; /* just a flag "nchars is nonzero" */
-+			break;
-+		case 's':
-+			silent = 1;
-+			break;
- 		case 't':
- 			p = strtotimeval(optionarg, &ts);
- 			if (*p || (!ts.tv_sec && !ts.tv_usec))
-@@ -118,6 +131,23 @@
- 		sh_error("arg count");
- 	if ((ifs = bltinlookup("IFS")) == NULL)
- 		ifs = defifs;
-+	if (n_flag || silent) {
-+		if (tcgetattr(0, &tty) != 0) {
-+			/* Not a tty */
-+			n_flag = 0;
-+			silent = 0;
-+		} else {
-+			old_tty = tty;
-+			if (n_flag) {
-+				tty.c_lflag &= ~ICANON;
-+				tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
-+			}
-+			if (silent) {
-+				tty.c_lflag &= ~(ECHO | ECHOK | ECHONL);
-+			}
-+			tcsetattr(0, TCSANOW, &tty);
-+		}
-+	}
- 	status = 0;
- 	startword = 1;
- 	backslash = 0;
-@@ -133,13 +163,15 @@
- 		ts.tv_sec += t0.tv_sec;
- 	}
- 	STARTSTACKSTR(p);
--	for (;;) {
-+	do {
- 		if (timeout) {
- 			gettimeofday(&t1, NULL);
- 			if (t1.tv_sec > ts.tv_sec ||
- 			    (t1.tv_sec == ts.tv_sec &&
- 			     t1.tv_usec >= ts.tv_usec)) {
- 				status = 1;
-+				if (n_flag)
-+					tcsetattr(0, TCSANOW, &old_tty);
- 				break;	/* Timeout! */
- 			}
- 
-@@ -156,6 +188,8 @@
- 			FD_SET(0, &set);
- 			if (select(1, &set, NULL, NULL, &to) != 1) {
- 				status = 1;
-+				if (n_flag)
-+					tcsetattr(0, TCSANOW, &old_tty);
- 				break; /* Timeout! */
- 			}
- 		}
-@@ -191,7 +225,9 @@
- put:
- 			STPUTC(c, p);
- 		}
--	}
-+	} while (!n_flag || --nchars);
-+	if (n_flag || silent)
-+		tcsetattr(0, TCSANOW, &old_tty);
- 	STACKSTRNUL(p);
- 	/* Remove trailing blanks */
- 	while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL)
diff --git a/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
deleted file mode 100644
index 041f67988c..0000000000
--- a/recipes/klibc/files/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/files/mntproc-definitions.patch b/recipes/klibc/files/mntproc-definitions.patch
deleted file mode 100644
index 5db24cd3aa..0000000000
--- a/recipes/klibc/files/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/files/signal-cleanup.patch b/recipes/klibc/files/signal-cleanup.patch
deleted file mode 100644
index ce7f5ebf72..0000000000
--- a/recipes/klibc/files/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
-