diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2010-08-06 01:42:01 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2010-08-06 01:43:32 +0200 |
| commit | 34f2f07769fe31db2a2224183377c9ff27c886f7 (patch) | |
| tree | 523060d93d00e5c5905f213326e537b2e6383023 | |
| parent | 7058b8b5dda8a6ce31e79c5253bb38789077c3ef (diff) | |
| download | openembedded-34f2f07769fe31db2a2224183377c9ff27c886f7.tar.gz | |
Revert "klibc: get rid of legacy staging"
* committed broken version with evil install
* WIP
This reverts commit b32ce2a63973fdf72d1ffe94b8418ec214cb2b20.
| -rw-r--r-- | recipes/klibc/klibc-common.inc | 2 | ||||
| -rw-r--r-- | recipes/klibc/klibc.inc | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc index 5db6f2468c..b4c27c9f4a 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 = "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 eed29edd1c..a40a45c567 100644 --- 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" |