diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-26 10:04:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-26 11:37:32 +0000 |
| commit | 82745e4f32e83a49e2fbb825ace8d3452c37b4d4 (patch) | |
| tree | fedd20ab2a9dae1e1c8266f992215cc2e96d6859 | |
| parent | 70301cc433f418af2654a9a7f1353faf4be03a3d (diff) | |
| download | openembedded-core-82745e4f32e83a49e2fbb825ace8d3452c37b4d4.tar.gz openembedded-core-82745e4f32e83a49e2fbb825ace8d3452c37b4d4.tar.bz2 openembedded-core-82745e4f32e83a49e2fbb825ace8d3452c37b4d4.zip | |
cross.bbclass: Move sysroot_stage_all function to the only place that uses it now (gcc-cross-intermediate)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cross.bbclass | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 2564505d6a..f9fd07a9a2 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -62,16 +62,3 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } -# -# Override the default sysroot staging copy since this won't look like a target system -# -sysroot_stage_all() { - sysroot_stage_dir ${D} ${SYSROOT_DESTDIR} - install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ - install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ - mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true - mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true -} - - - diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index 01571a3202..2e5283d691 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -45,3 +45,15 @@ do_install () { ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t done } + +# +# Override the default sysroot staging copy since this won't look like a target system +# +sysroot_stage_all() { + sysroot_stage_dir ${D} ${SYSROOT_DESTDIR} + install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ + install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ + mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true + mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true +} + |