cross.bbclass: Move sysroot_stage_all function to the only place that uses it now...

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 2564505d6a2871ec4963427488b306229d92e522..f9fd07a9a2ab421594e02134a767e94ce463a312 100644 (file)
--- 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 01571a32026611c54fcc2db6cb5562b44be2dc33..2e5283d6914c43666f48580c6e5e0557f63a73ed 100644 (file)
--- 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
+}
+