klibc_1.5.24: remove nostrip patch and fix packaging of klibc-utils

* follow Debian packaging for klibc-utils
* bump PR

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

5 files changed, 28 insertions, 47 deletions

diff --git a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/no_strip.patch b/meta-oe/recipes-devtools/klibc/klibc-1.5.24/no_strip.patch
deleted file mode 100644
index f690d9883b..0000000000
--- a/meta-oe/recipes-devtools/klibc/klibc-1.5.24/no_strip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Do not strip binaries too early. Strip is done before packaging.
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
---- a/scripts/Kbuild.klibc      2011-06-14 17:11:17.000000000 +0200
-+++ b/scripts/Kbuild.klibc      2011-07-15 01:18:58.000000000 +0200
-@@ -332,8 +332,7 @@
-                        $(KLIBCLIBC)                            \
-                       $(KLIBCLIBGCC)                           \
-                       --end-group ;                            \
--                      cp -f $@ $@.g ;                          \
--                      $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@
-+                       cp -f $@ $@.g
- 
- 
- $(static-y): $(kprog-objs) $(lib-target) $(KLIBCCRT0) $(KLIBCLIBC) FORCE
-@@ -348,8 +347,7 @@
-                        -R $(KLIBCLIBCSHARED)                   \
-                       $(KLIBCLIBGCC)                           \
-                       --end-group ;                            \
--                      cp -f $@ $@.g ;                          \
--                      $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@
-+                       cp -f $@ $@.g
- 
- 
- $(shared-y): $(kprog-objs) $(lib-target) $(KLIBCCRTSHARED) \
-
---- a/usr/klibc/Kbuild  2011-07-15 01:46:32.000000000 +0200
-+++ b/usr/klibc/Kbuild  2011-07-15 01:47:17.000000000 +0200
-@@ -147,7 +147,6 @@
- 
- quiet_cmd_sohash = GEN     $@
-       cmd_sohash = cat $< > $@;                                           \
--                     $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@;                 \
-                     chmod a+x $@;                                        \
-                      rm -f $(obj)/klibc-???????????????????????????.so;   \
-                      ln -f $@ $(obj)/klibc-$(SOLIBHASH).so
diff --git a/meta-oe/recipes-devtools/klibc/klibc-utils.inc b/meta-oe/recipes-devtools/klibc/klibc-utils.inc
index a360c2e7f9..0f195a3f34 100644
--- a/meta-oe/recipes-devtools/klibc/klibc-utils.inc
+++ b/meta-oe/recipes-devtools/klibc/klibc-utils.inc
@@ -9,9 +9,15 @@ do_install_append() {
         install -d ${D}${base_bindir}
         install -d ${D}${base_sbindir}
 
-        # those 2 are always static
-        install -m 755 usr/dash/sh ${D}${base_bindir}/sh
-        install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+        # debian packages kinit + kinit.shared but only sh.shared
+        if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then
+            install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+            install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
+            install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
+        else
+            install -m 755 usr/dash/sh ${D}${base_bindir}/sh
+            install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+        fi
 
         install -m 755 usr/gzip/gzip ${D}${base_bindir}
         install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir}
diff --git a/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.24.bb
new file mode 100644
index 0000000000..b26dda400f
--- /dev/null
+++ b/meta-oe/recipes-devtools/klibc/klibc-utils_1.5.24.bb
@@ -0,0 +1,17 @@
+PR = "${INC_PR}.0"
+
+KLIBC_UTILS_VARIANT = "shared"
+KLIBC_UTILS_PKGNAME = "klibc-utils"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+do_install() {
+        :
+}
+
+PACKAGES_${PN} = "${PN}"
+FILES_${PN} = ""
+
+require klibc-utils.inc
+require klibc.inc
+require klibc-checksums_${PV}.inc
diff --git a/meta-oe/recipes-devtools/klibc/klibc.inc b/meta-oe/recipes-devtools/klibc/klibc.inc
index 62bf1e737d..665412349d 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 = "r0"
+INC_PR = "r1"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -33,7 +33,6 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://modprobe.patch \
             file://dash_readopt.patch \
             file://wc.patch \
-            file://no_strip.patch \
             file://staging.patch \
             file://socket.h.patch \
             "
diff --git a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb
index 124a416d3f..a313bfd771 100644
--- a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb
+++ b/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb
@@ -15,11 +15,6 @@ do_install() {
         find ${D}${base_libdir}/klibc/include -name '.install' -delete
         find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete
 
-        # only for sh.shared and kinit.shared
-        install -d ${D}${base_bindir}
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
-
         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)
@@ -35,6 +30,6 @@ FILES_libklibc-dev = "${base_libdir}/klibc.so \
 # see above
 # do not package it in -dev
 #                      ${base_bindir}/klcc \
-require klibc-utils.inc
+
 require klibc.inc
 require klibc-checksums_${PV}.inc