From b32ce2a63973fdf72d1ffe94b8418ec214cb2b20 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 5 Aug 2010 01:33:33 +0200 Subject: klibc: get rid of legacy staging * bump PR --- recipes/klibc/klibc-common.inc | 2 +- recipes/klibc/klibc.inc | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc index b4c27c9f4a..5db6f2468c 100644 --- 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 = "r17" +INC_PR = "r18" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index a40a45c567..eed29edd1c 100644 --- a/recipes/klibc/klibc.inc +++ b/recipes/klibc/klibc.inc @@ -3,6 +3,9 @@ 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} @@ -11,10 +14,6 @@ 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" -- cgit v1.2.3