klibc: upgrade to latest git (pre 2.0)

* remove cherry-picked patch applied in master
* remove comments in klcc recipe
* remove slashes from paths in klibc recipe
* revert involontary oe_runmake install changes
* reset INC_PR
* v2 removes obolete cleanings wrt headers_install

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

16 files changed, 5 insertions, 61 deletions

diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26+2.0.bb
index 5a6739d4e0..56456f7a82 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26+2.0.bb
@@ -11,11 +11,6 @@ DEPENDS = "klibc"
 
 FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
 
-# ${TARGET_PREFIX}klcc is just a
-# perl wrapper around gcc-cross
-# so give it the same arch and path
-#PACKAGE_ARCH = "${TUNE_PKGARCH}"
-
 inherit cross
 
 do_configure () {
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/dash_readopt.patch
index 3be1be04fb..3be1be04fb 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/dash_readopt.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch
index 3fec98d2cc..3fec98d2cc 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klcc_prefix.patch
index a4a0026e4d..a4a0026e4d 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klcc_prefix.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-config-eabi.patch
index 316c80a926..316c80a926 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-config-eabi.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-linux-libc-dev.patch
index 3c55e1482c..3c55e1482c 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-linux-libc-dev.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/modprobe.patch
index eb2fb39e64..eb2fb39e64 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/modprobe.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/prefix.patch
index 6f5ff0d607..6f5ff0d607 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/prefix.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/staging.patch
index 03955f25ca..03955f25ca 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/staging.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/use-env-for-perl.patch
index eac128cc09..eac128cc09 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/use-env-for-perl.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/wc.patch
index 28705fd7aa..28705fd7aa 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/wc.patch
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch
deleted file mode 100644
index c2369cd8cf..0000000000
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7f47891c1678874cccca66cd25e6a13486c86d78 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Maciej=20=C5=BBenczykowski?= <zenczykowski@gmail.com>
-Date: Sun, 6 Nov 2011 14:33:40 -0800
-Subject: [PATCH] [klibc] include: [sys/types.h] -> linux/types.h and
- __aligned_u64
-
-When building klibc 1.5.25 against linux/master (ie. post 3.1) I'm seeing:
-
-klibc/generated/include/linux/if_packet.h:176: error: expected
-specifier-qualifier-list before '__aligned_u64'
-
-which seems to come from upstream commits:
-0d4691ce112be025019999df5f2a5e00c03f03c2 remotes/linux/master~90^2~408  (origin)
-96c131842aab45b5d139d0bcb417796819f5ee92 remotes/linux/master~90^2~169
- (change from aligned_u64 to __aligned_u64)
-
-and collides with klibc/usr/include/sys/types.h
-
-/* Keeps linux/types.h from getting included elsewhere */
-#define _LINUX_TYPES_H
-
-not defining __aligned_u64 like the kernel's include/linux/types.h does.
-
-Signed-off-by: maximilian attems <max@stro.at>
----
- usr/include/sys/types.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/usr/include/sys/types.h b/usr/include/sys/types.h
-index 6780ed1..3a4c738 100644
---- a/usr/include/sys/types.h
-+++ b/usr/include/sys/types.h
-@@ -100,6 +100,10 @@ typedef uint16_t __sum16;
- typedef uint32_t __sum32;
- typedef uint64_t __sum64;
- 
-+#define __aligned_u64 __u64 __attribute__((aligned(8)))
-+#define __aligned_be64 __be64 __attribute__((aligned(8)))
-+#define __aligned_le64 __le64 __attribute__((aligned(8)))
-+
- /*
-  * Some headers seem to require this...
-  */
--- 
-1.7.6.5
-
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26+2.0.bb
index 484134e44b..484134e44b 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26+2.0.bb
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26+2.0.bb
index 37cab84c52..37cab84c52 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26+2.0.bb
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index f89af9de65..370659807c 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8
 # 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'
@@ -21,7 +21,7 @@ KLIBC_ARCH_i586 = 'i386'
 KLIBC_ARCH_i686 = 'i386'
 KLIBC_ARCH_pentium = 'i386'
 
-SRCREV = "c7dedd5d11b075b5e6cecd6aa82b70b748179121"
+SRCREV = "f8e0ad9812f5e3fe0e7006061b1d5f9f67a80325"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git"
 
 SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch"
@@ -34,17 +34,16 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://wc.patch \
             file://prefix.patch \
             file://staging.patch \
-            file://kernel_3.2__aligned_u64.patch  \
             "
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
-                'KLIBCKERNELSRC=${STAGING_DIR_TARGET}/${exec_prefix}' \
+                'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \
                 "
 
 do_configure () {
 
-        ln -sf "${STAGING_DIR_TARGET}/${exec_prefix}" linux
+        ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux
 }
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26+2.0.bb
index 101ba555ea..8eaab2c447 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26+2.0.bb
@@ -4,7 +4,7 @@ export INST = "${D}"
 
 do_install() {
 
-        oe_runmake DESTDIR="${D}" install
+        oe_runmake install
 
         # the crosscompiler is packaged by klcc-cross
         # remove klcc
@@ -12,10 +12,6 @@ do_install() {
         # remove now empty dir
         rmdir ${D}${base_bindir}
 
-        # remove Linux headers .install and ..install.cmd files
-        find ${D}${base_libdir}/klibc/include -name '.install' -delete
-        find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete
-
         install -d ${D}${base_libdir}
         install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
         (cd  ${D}${base_libdir}; ln -s klibc-*.so klibc.so)