Revert "klibc: get rid of legacy staging"

* committed broken version with evil install
* WIP
This reverts commit b32ce2a63973fdf72d1ffe94b8418ec214cb2b20.

diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index 5db6f24..b4c27c9 100644 (file)
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV
 
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r18"
+INC_PR = "r17"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'

diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index eed29ed..a40a45c 100644 (file)
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -3,9 +3,6 @@ do_install() {
         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
 
-        oe_runmake  install
-        install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc
-
         install -d ${D}${base_libdir}
         install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
         cd ${D}${base_libdir}
@@ -14,6 +11,10 @@ do_install() {
 }
 
 export INST=${STAGING_DIR_TARGET}
+do_stage() {
+        oe_runmake  install
+        cp '${STAGING_DIR_TARGET}/bin/klcc'  '${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc'
+}
 
 PACKAGES = "${PN} ${PN}-dev "
 FILES_${PN} = "${base_libdir}/klibc-*.so"