16 files changed, 3 insertions, 35 deletions

diff --git a/meta-oe/recipes-devtools/klibc/klcc-cross_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klcc-cross_1.5.25.bb
index 922c8d84f2..922c8d84f2 100644
--- a/meta-oe/recipes-devtools/klibc/klcc-cross_1.5.24.bb
+++ b/meta-oe/recipes-devtools/klibc/klcc-cross_1.5.25.bb
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/socket.h.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.24/socket.h.patch
deleted file mode 100644
index c0a94cee58..0000000000
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/socket.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Subject: Add relevant socket.h definitions
-
-* Discussed upstream:
-* http://www.zytor.com/pipermail/klibc/2010-February/002487.html
-* http://www.zytor.com/pipermail/klibc/2010-February/002488.html
-*
-* Was: Add guards for pre 2.6.33 compatibility.
-*
-* Changes for 1.5.24
-* Only include linux/sockios.h for SIOCGIFCONF and SIOCSIFFLAGS
-* requested by kexec-tools when building statically against klibc.
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Index: klibc-1.5.24/usr/include/sys/socket.h
-===================================================================
---- a/usr/include/sys/socket.h  2011-07-27 15:50:53.000000000 +0200
-+++ b/usr/include/sys/socket.h  2010-05-31 00:44:16.000000000 +0200
-@@ -10,6 +10,12 @@
- #include <klibc/compiler.h>
- #include <klibc/sysconfig.h>
- #include <linux/socket.h>
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <linux/sockios.h>             /* the SIOCxxx I/O controls     */
-+#endif
-+
- #include <linux/uio.h>
- #include <asm/socket.h>
- #if _KLIBC_HAS_ARCHSOCKET_H
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/dash_readopt.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch
index 3be1be04fb..3be1be04fb 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/dash_readopt.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/fstype-sane-vfat-and-jffs2-for-1.5.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch
index 3fec98d2cc..3fec98d2cc 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/klcc_prefix.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch
index a4a0026e4d..a4a0026e4d 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/klcc_prefix.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/klibc-config-eabi.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch
index 316c80a926..316c80a926 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/klibc-config-eabi.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/modprobe.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch
index eb2fb39e64..eb2fb39e64 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/modprobe.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/staging.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/staging.patch
index cedd5e6393..cedd5e6393 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/staging.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/staging.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/use-env-for-perl.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch
index eac128cc09..eac128cc09 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/use-env-for-perl.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/wc.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/wc.patch
index 28705fd7aa..28705fd7aa 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/wc.patch
+++ b/meta-oe/recipes-devtools/klibc/klibc-1.5.25/wc.patch
diff --git a/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.24.inc b/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.24.inc
deleted file mode 100644
index 31ed66b3f9..0000000000
--- a/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.24.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "4df9b0d3d7f9f366c4b5c171cac3c6c3"
-SRC_URI[sha256sum] = "71fac12937ead3f104aad8ac40567ecdcac1ea27474cce939f6226499b1895a2"
diff --git a/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.25.inc b/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.25.inc
new file mode 100644
index 0000000000..ebba6587c8
--- /dev/null
+++ b/meta-oe/recipes-devtools/klibc/klibc-checksums_1.5.25.inc
@@ -0,0 +1,2 @@
+SRC_URI[md5sum] = "5bc4dcd63e9142b934787729133c2766"
+SRC_URI[sha256sum] = "0b910ec0b2a97d4c775ed06e44ad7bca7be150efdf2a77a19253a573e16367d3"
diff --git a/meta-oe/recipes-devtools/klibc/klibc-static-utils_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb
index c9749f0d7a..c9749f0d7a 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-static-utils_1.5.24.bb
+++ b/meta-oe/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb
diff --git a/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.25.bb
index b26dda400f..b26dda400f 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.24.bb
+++ b/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.25.bb
diff --git a/meta-oe/recipes-devtools/klibc/klibc.inc b/meta-oe/recipes-devtools/klibc/klibc.inc
index 665412349d..1b1f7c626d 100644
--- a/meta-oe/recipes-devtools/klibc/klibc.inc
+++ b/meta-oe/recipes-devtools/klibc/klibc.inc
@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # debugsources.list: No such file or directory:
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INC_PR = "r1"
+INC_PR = "r0"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -34,7 +34,6 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://dash_readopt.patch \
             file://wc.patch \
             file://staging.patch \
-            file://socket.h.patch \
             "
 
 S = "${WORKDIR}/klibc-${PV}"
diff --git a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc_1.5.25.bb
index a313bfd771..a313bfd771 100644
--- a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb
+++ b/meta-oe/recipes-devtools/klibc/klibc_1.5.25.bb