klibc: move to 1.5.23

* retain compatibilty patches for older kernels

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

20 files changed, 27 insertions, 25 deletions

diff --git a/recipes/klibc/klcc-cross_1.5.22.bb b/recipes/klibc/klcc-cross_1.5.23.bb
index 8f701fd911..8f701fd911 100644
--- a/recipes/klibc/klcc-cross_1.5.22.bb
+++ b/recipes/klibc/klcc-cross_1.5.23.bb
diff --git a/recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch b/recipes/klibc/klibc-1.5.23/arm-signal-cleanup.patch
index a2a94a3989..a2a94a3989 100644
--- a/recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch
+++ b/recipes/klibc/klibc-1.5.23/arm-signal-cleanup.patch
diff --git a/recipes/klibc/klibc-1.5.22/dash_readopt.patch b/recipes/klibc/klibc-1.5.23/dash_readopt.patch
index 3389bd9dd4..3be1be04fb 100644
--- a/recipes/klibc/klibc-1.5.22/dash_readopt.patch
+++ b/recipes/klibc/klibc-1.5.23/dash_readopt.patch
@@ -10,13 +10,13 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
 +++ klibc-1.5.22/usr/dash/miscbltin.c	2011-06-11 13:55:32.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <ctype.h>
- #include <stdint.h>
+ #include <inttypes.h>
  #include <time.h>		/* strtotimeval() */
 +#include <termios.h>
  
  #include "shell.h"
  #include "options.h"
-@@ -140,6 +141,11 @@
+@@ -149,6 +150,11 @@
  	int timeout;
  	int i;
  	fd_set set;
@@ -28,7 +28,7 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
  	struct timeval ts, t0, t1, to;
  
  	ts.tv_sec = ts.tv_usec = 0;
-@@ -147,11 +153,18 @@
+@@ -156,11 +162,18 @@
  	rflag = 0;
  	timeout = 0;
  	prompt = NULL;
@@ -48,7 +48,7 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
  		case 't':
  			p = strtotimeval(optionarg, &ts);
  			if (*p || (!ts.tv_sec && !ts.tv_usec))
-@@ -173,6 +186,24 @@
+@@ -182,6 +197,24 @@
  	}
  	if (*(ap = argptr) == NULL)
  		sh_error("arg count");
@@ -70,13 +70,12 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
 +		}
 +	}
 +
+ 
  	status = 0;
- 	backslash = 0;
  	if (timeout) {
-@@ -187,13 +218,15 @@
- 		ts.tv_sec += t0.tv_sec;
- 	}
- 	STARTSTACKSTR(p);
+@@ -200,12 +231,14 @@
+	goto start;
+ 
 -	for (;;) {
 +	do {
  		if (timeout) {
@@ -90,7 +89,7 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
  				break;	/* Timeout! */
  			}
  
-@@ -210,6 +243,8 @@
+@@ -222,6 +255,8 @@
  			FD_SET(0, &set);
  			if (select(1, &set, NULL, NULL, &to) != 1) {
  				status = 1;
@@ -99,15 +98,14 @@ diff -uNr klibc-1.5.22.orig//usr/dash/miscbltin.c klibc-1.5.22/usr/dash/miscblti
  				break; /* Timeout! */
  			}
  		}
-@@ -235,7 +270,10 @@
- 		STPUTC(c, p);
- resetbs:
- 		backslash = 0;
+@@ -263,6 +298,9 @@
+ 			newloc = startloc - 1;
+ 		}
 -	}
 +	} while (!n_flag || --nchars);
 +	if (n_flag || silent)
 +		tcsetattr(0, TCSANOW, &old_tty);
 +
+ out:
+ 	recordregion(startloc, p - (char *)stackblock(), 0);
  	STACKSTRNUL(p);
- 	readcmd_handle_line(stackblock(), ap, p + 1 - (char *)stackblock());
- 	return status;
diff --git a/recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.23/fstype-sane-vfat-and-jffs2-for-1.5.patch
index 3fec98d2cc..3fec98d2cc 100644
--- a/recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/recipes/klibc/klibc-1.5.23/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/recipes/klibc/klibc-1.5.22/getrusage.patch b/recipes/klibc/klibc-1.5.23/getrusage.patch
index 224ab321d7..224ab321d7 100644
--- a/recipes/klibc/klibc-1.5.22/getrusage.patch
+++ b/recipes/klibc/klibc-1.5.23/getrusage.patch
diff --git a/recipes/klibc/klibc-1.5.22/isystem.patch b/recipes/klibc/klibc-1.5.23/isystem.patch
index 6db7eb60f7..6db7eb60f7 100644
--- a/recipes/klibc/klibc-1.5.22/isystem.patch
+++ b/recipes/klibc/klibc-1.5.23/isystem.patch
diff --git a/recipes/klibc/klibc-1.5.22/klcc_prefix.patch b/recipes/klibc/klibc-1.5.23/klcc_prefix.patch
index e4fe2411ba..e4fe2411ba 100644
--- a/recipes/klibc/klibc-1.5.22/klcc_prefix.patch
+++ b/recipes/klibc/klibc-1.5.23/klcc_prefix.patch
diff --git a/recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.23/klibc-config-eabi.patch
index 316c80a926..316c80a926 100644
--- a/recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch
+++ b/recipes/klibc/klibc-1.5.23/klibc-config-eabi.patch
diff --git a/recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.23/klibc_kexecsyscall.patch
index b5910e78d0..b5910e78d0 100644
--- a/recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch
+++ b/recipes/klibc/klibc-1.5.23/klibc_kexecsyscall.patch
diff --git a/recipes/klibc/klibc-1.5.22/modprobe.patch b/recipes/klibc/klibc-1.5.23/modprobe.patch
index b175705760..eb2fb39e64 100644
--- a/recipes/klibc/klibc-1.5.22/modprobe.patch
+++ b/recipes/klibc/klibc-1.5.23/modprobe.patch
@@ -11,7 +11,7 @@ diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
 @@ -4,7 +4,7 @@
  
  progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
- progs += true false sleep ln nuke minips cat ls losetup
+ progs += true false sleep ln mv nuke minips cat ls losetup
 -progs += uname halt kill readlink cpio sync dmesg
 +progs += uname halt kill readlink cpio sync dmesg modprobe
  
diff --git a/recipes/klibc/klibc-1.5.22/socket.h.patch b/recipes/klibc/klibc-1.5.23/socket.h.patch
index 8890906fd1..8890906fd1 100644
--- a/recipes/klibc/klibc-1.5.22/socket.h.patch
+++ b/recipes/klibc/klibc-1.5.23/socket.h.patch
diff --git a/recipes/klibc/klibc-1.5.22/staging.patch b/recipes/klibc/klibc-1.5.23/staging.patch
index 827eac5b8b..827eac5b8b 100644
--- a/recipes/klibc/klibc-1.5.22/staging.patch
+++ b/recipes/klibc/klibc-1.5.23/staging.patch
diff --git a/recipes/klibc/klibc-1.5.22/use-env-for-perl.patch b/recipes/klibc/klibc-1.5.23/use-env-for-perl.patch
index eac128cc09..eac128cc09 100644
--- a/recipes/klibc/klibc-1.5.22/use-env-for-perl.patch
+++ b/recipes/klibc/klibc-1.5.23/use-env-for-perl.patch
diff --git a/recipes/klibc/klibc-1.5.22/wc.patch b/recipes/klibc/klibc-1.5.23/wc.patch
index 2b88c2b0a2..28705fd7aa 100644
--- a/recipes/klibc/klibc-1.5.22/wc.patch
+++ b/recipes/klibc/klibc-1.5.23/wc.patch
@@ -15,12 +15,12 @@ index a52ea61..7c8ccfb 100644
  #
  
  progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
--progs += true false sleep ln nuke minips cat ls losetup
-+progs += true false sleep ln nuke minips cat ls losetup wc
+-progs += true false sleep ln mv nuke minips cat ls losetup
++progs += true false sleep ln mv nuke minips cat ls losetup wc
  progs += uname halt kill readlink cpio sync dmesg modprobe
  
  static-y := $(addprefix static/, $(progs))
-@@ -60,6 +60,8 @@ static/losetup-y    := losetup.o
+@@ -62,6 +62,8 @@ static/losetup-y    := losetup.o
  shared/losetup-y    := losetup.o
  static/modprobe-y   := modprobe.o
  shared/modprobe-y   := modprobe.o
diff --git a/recipes/klibc/klibc-checksums_1.5.22.inc b/recipes/klibc/klibc-checksums_1.5.22.inc
deleted file mode 100644
index 3966142668..0000000000
--- a/recipes/klibc/klibc-checksums_1.5.22.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "2eb5ef12978099736be9b0d0d7d5e946"
-SRC_URI[sha256sum] = "0011ef50cb69b62033faa2d4a5e557f8998560ba97440af3962c1bc7bdaf8033"
diff --git a/recipes/klibc/klibc-checksums_1.5.23.inc b/recipes/klibc/klibc-checksums_1.5.23.inc
new file mode 100644
index 0000000000..f94c478eab
--- /dev/null
+++ b/recipes/klibc/klibc-checksums_1.5.23.inc
@@ -0,0 +1,2 @@
+SRC_URI[md5sum] = "38a0ac99c4facd14443f4495b29aeff1"
+SRC_URI[sha256sum] = "71741882b8323fc1ce1c22a41b1901526c7fa2b7c97845d7a9558ca9d3931ef0"
diff --git a/recipes/klibc/klibc-static-utils_1.5.22.bb b/recipes/klibc/klibc-static-utils_1.5.23.bb
index 681d6f012a..681d6f012a 100644
--- a/recipes/klibc/klibc-static-utils_1.5.22.bb
+++ b/recipes/klibc/klibc-static-utils_1.5.23.bb
diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
index 993b9d5ea0..b69c16bbd4 100644
--- a/recipes/klibc/klibc-utils.inc
+++ b/recipes/klibc/klibc-utils.inc
@@ -29,6 +29,7 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir}
@@ -69,6 +70,7 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-mknod \
              ${KLIBC_UTILS_PKGNAME}-modprobe \
              ${KLIBC_UTILS_PKGNAME}-mount \
+             ${KLIBC_UTILS_PKGNAME}-mv \
              ${KLIBC_UTILS_PKGNAME}-nuke \
              ${KLIBC_UTILS_PKGNAME}-pivot-root \
              ${KLIBC_UTILS_PKGNAME}-poweroff \
@@ -106,6 +108,7 @@ FILES_${KLIBC_UTILS_PKGNAME}-mkfifo = "${base_bindir}/mkfifo"
 FILES_${KLIBC_UTILS_PKGNAME}-mknod = "${base_bindir}/mknod"
 FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe"
 FILES_${KLIBC_UTILS_PKGNAME}-mount = "${base_bindir}/mount"
+FILES_${KLIBC_UTILS_PKGNAME}-mv = "${base_bindir}/mount"
 FILES_${KLIBC_UTILS_PKGNAME}-nuke = "${base_bindir}/nuke"
 FILES_${KLIBC_UTILS_PKGNAME}-pivot-root = "${base_bindir}/pivot_root"
 FILES_${KLIBC_UTILS_PKGNAME}-poweroff = "${base_bindir}/poweroff"
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index 68405814cc..2040e3aa09 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -5,12 +5,12 @@ use with initramfs.  It is deliberately written for small size, \
 minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
 
-# We need to point to the kernel headers for ARCH but we don't want to become
+# We need to point to the kernel headers for ARCH but we do not want to become
 # machine specific so we use the headers staged for the current machine.
 # (was PACKAGE_ARCH = "${MACHINE_ARCH}")
 MACH_STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
 
-INC_PR = "r3"
+INC_PR = "r0"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
diff --git a/recipes/klibc/klibc_1.5.22.bb b/recipes/klibc/klibc_1.5.23.bb
index 11faee4355..308d3c9a60 100644
--- a/recipes/klibc/klibc_1.5.22.bb
+++ b/recipes/klibc/klibc_1.5.23.bb
@@ -7,7 +7,7 @@ do_install() {
         oe_runmake install
 
 # the crosscompiler is packaged by klcc-cross
-# remove klcc 
+# remove klcc
 # remove also from FILES_${PN}-dev
         rm ${D}${base_bindir}/klcc
 
@@ -61,6 +61,7 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (= ${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-mv = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (= ${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (= ${PV}-${PR})"