7 files changed, 8 insertions, 9 deletions
diff --git a/recipes/klibc/klibc-1.5.18.inc b/recipes/klibc/klibc-1.5.18.inc
deleted file mode 100644
index 3c8c5fefb8..0000000000
--- a/recipes/klibc/klibc-1.5.18.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b"
-SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446"
diff --git a/recipes/klibc/files/isystem.patch b/recipes/klibc/klibc-1.5.18/isystem.patch
index ccdf9ed92d..ccdf9ed92d 100644
--- a/recipes/klibc/files/isystem.patch
+++ b/recipes/klibc/klibc-1.5.18/isystem.patch
diff --git a/recipes/klibc/files/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch
index 86517f0594..86517f0594 100644
--- a/recipes/klibc/files/klibc-config-eabi.patch
+++ b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch
diff --git a/recipes/klibc/files/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch
index 9b2dca4738..9b2dca4738 100644
--- a/recipes/klibc/files/klibc_kexecsyscall.patch
+++ b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch
diff --git a/recipes/klibc/files/losetup.patch b/recipes/klibc/klibc-1.5.18/losetup.patch
index 77049bd05f..77049bd05f 100644
--- a/recipes/klibc/files/losetup.patch
+++ b/recipes/klibc/klibc-1.5.18/losetup.patch
diff --git a/recipes/klibc/klibc-utils-static_1.5.18.bb b/recipes/klibc/klibc-utils-static_1.5.18.bb
index 30b2222def..2b6494d960 100644
--- a/recipes/klibc/klibc-utils-static_1.5.18.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.18.bb
@@ -15,4 +15,6 @@ KLIBC_UTILS_PKGNAME = "klibc-utils-static"
 #######################
 require klibc-utils.inc
 require klibc.inc
-require klibc-${PV}.inc
+
+SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b"
+SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446"
diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb
index 8271abc8ab..a70405e025 100644
--- a/recipes/klibc/klibc_1.5.18.bb
+++ b/recipes/klibc/klibc_1.5.18.bb
@@ -1,4 +1,5 @@
 do_install() {
+	oe_runmake DEST_DIR=${D} 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
@@ -6,15 +7,11 @@ 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)
+        install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc
 }
 
 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"
 FILES_${PN}-dev = "${base_libdir}/klibc.so"
@@ -60,4 +57,6 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})"
 #######################
 require klibc-utils.inc
 require klibc.inc
-require klibc-${PV}.inc
+
+SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b"
+SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446"