klibc: upgrade to 1.5.22

* fix QA about klcc installed but not packaged
* (we purposedly skip it)
* remove .install and ..install.cmd files (headers install)

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

19 files changed, 15 insertions, 7 deletions

diff --git a/recipes/klibc/klcc-cross_1.5.21.bb b/recipes/klibc/klcc-cross_1.5.22.bb
index 541d6740b5..8f701fd911 100644
--- a/recipes/klibc/klcc-cross_1.5.21.bb
+++ b/recipes/klibc/klcc-cross_1.5.22.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 require klibc.inc
 require klibc-checksums_${PV}.inc
diff --git a/recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch b/recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch
index b95d6aec95..b95d6aec95 100644
--- a/recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch
+++ b/recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch
diff --git a/recipes/klibc/klibc-1.5.21/dash_readopt.patch b/recipes/klibc/klibc-1.5.22/dash_readopt.patch
index 0633417f38..0633417f38 100644
--- a/recipes/klibc/klibc-1.5.21/dash_readopt.patch
+++ b/recipes/klibc/klibc-1.5.22/dash_readopt.patch
diff --git a/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch
index 4448fe26e9..4448fe26e9 100644
--- a/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/recipes/klibc/klibc-1.5.21/getrusage.patch b/recipes/klibc/klibc-1.5.22/getrusage.patch
index 224ab321d7..224ab321d7 100644
--- a/recipes/klibc/klibc-1.5.21/getrusage.patch
+++ b/recipes/klibc/klibc-1.5.22/getrusage.patch
diff --git a/recipes/klibc/klibc-1.5.21/isystem.patch b/recipes/klibc/klibc-1.5.22/isystem.patch
index ccdf9ed92d..ccdf9ed92d 100644
--- a/recipes/klibc/klibc-1.5.21/isystem.patch
+++ b/recipes/klibc/klibc-1.5.22/isystem.patch
diff --git a/recipes/klibc/klibc-1.5.21/klcc_prefix.patch b/recipes/klibc/klibc-1.5.22/klcc_prefix.patch
index e4fe2411ba..e4fe2411ba 100644
--- a/recipes/klibc/klibc-1.5.21/klcc_prefix.patch
+++ b/recipes/klibc/klibc-1.5.22/klcc_prefix.patch
diff --git a/recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch
index 86517f0594..86517f0594 100644
--- a/recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch
+++ b/recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch
diff --git a/recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch
index 6243db6c18..6243db6c18 100644
--- a/recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch
+++ b/recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch
diff --git a/recipes/klibc/klibc-1.5.21/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.22/mntproc-definitions.patch
index 5db24cd3aa..5db24cd3aa 100644
--- a/recipes/klibc/klibc-1.5.21/mntproc-definitions.patch
+++ b/recipes/klibc/klibc-1.5.22/mntproc-definitions.patch
diff --git a/recipes/klibc/klibc-1.5.21/modprobe.patch b/recipes/klibc/klibc-1.5.22/modprobe.patch
index d89010cc1c..d89010cc1c 100644
--- a/recipes/klibc/klibc-1.5.21/modprobe.patch
+++ b/recipes/klibc/klibc-1.5.22/modprobe.patch
diff --git a/recipes/klibc/klibc-1.5.21/socket.h.patch b/recipes/klibc/klibc-1.5.22/socket.h.patch
index 864fa2296c..864fa2296c 100644
--- a/recipes/klibc/klibc-1.5.21/socket.h.patch
+++ b/recipes/klibc/klibc-1.5.22/socket.h.patch
diff --git a/recipes/klibc/klibc-1.5.21/staging.patch b/recipes/klibc/klibc-1.5.22/staging.patch
index 9418c6b764..9418c6b764 100644
--- a/recipes/klibc/klibc-1.5.21/staging.patch
+++ b/recipes/klibc/klibc-1.5.22/staging.patch
diff --git a/recipes/klibc/klibc-1.5.21/use-env-for-perl.patch b/recipes/klibc/klibc-1.5.22/use-env-for-perl.patch
index 8609864251..8609864251 100644
--- a/recipes/klibc/klibc-1.5.21/use-env-for-perl.patch
+++ b/recipes/klibc/klibc-1.5.22/use-env-for-perl.patch
diff --git a/recipes/klibc/klibc-1.5.21/wc.patch b/recipes/klibc/klibc-1.5.22/wc.patch
index 9063a5a1c3..9063a5a1c3 100644
--- a/recipes/klibc/klibc-1.5.21/wc.patch
+++ b/recipes/klibc/klibc-1.5.22/wc.patch
diff --git a/recipes/klibc/klibc-checksums_1.5.21.inc b/recipes/klibc/klibc-checksums_1.5.21.inc
deleted file mode 100644
index 6b257029e8..0000000000
--- a/recipes/klibc/klibc-checksums_1.5.21.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "c232f3fd4e733f4d6ff8909fd54b9970"
-SRC_URI[sha256sum] = "d1de0d4a6a4a337624d19587713d253ce4636dd5492d23bad75f89e4b679e202"
diff --git a/recipes/klibc/klibc-checksums_1.5.22.inc b/recipes/klibc/klibc-checksums_1.5.22.inc
new file mode 100644
index 0000000000..3966142668
--- /dev/null
+++ b/recipes/klibc/klibc-checksums_1.5.22.inc
@@ -0,0 +1,2 @@
+SRC_URI[md5sum] = "2eb5ef12978099736be9b0d0d7d5e946"
+SRC_URI[sha256sum] = "0011ef50cb69b62033faa2d4a5e557f8998560ba97440af3962c1bc7bdaf8033"
diff --git a/recipes/klibc/klibc-static-utils_1.5.21.bb b/recipes/klibc/klibc-static-utils_1.5.22.bb
index 681d6f012a..681d6f012a 100644
--- a/recipes/klibc/klibc-static-utils_1.5.21.bb
+++ b/recipes/klibc/klibc-static-utils_1.5.22.bb
diff --git a/recipes/klibc/klibc_1.5.21.bb b/recipes/klibc/klibc_1.5.22.bb
index 65efa3eb9f..11faee4355 100644
--- a/recipes/klibc/klibc_1.5.21.bb
+++ b/recipes/klibc/klibc_1.5.22.bb
@@ -4,12 +4,17 @@ export INST=${D}
 
 do_install() {
 
-# klcc for target host needs to be fixed
-# removed also from FILES_${PN}-dev
+        oe_runmake install
 
-        rm klcc/klcc
+# the crosscompiler is packaged by klcc-cross
+# remove klcc 
+# remove also from FILES_${PN}-dev
+        rm ${D}${base_bindir}/klcc
+
+        # 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
 
-        oe_runmake install
         install -d ${D}${base_bindir}
         install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh
         install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit
@@ -17,6 +22,7 @@ do_install() {
         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)
+
 }
 
 PACKAGES = "${PN} ${PN}-dev"
@@ -24,6 +30,8 @@ FILES_${PN} = "${base_libdir}/klibc-*.so"
 FILES_${PN}-dev = "${base_libdir}/klibc.so \
                    ${base_libdir}/klibc/lib/* \
                    ${base_libdir}/klibc/include/* \
+# see above
+# do not package it
 #                   ${base_bindir}/klcc \
                   "
 

path: root/meta/files/common-licenses/CC-BY-2.5