Install cross-packages into the native sysroot

Cross is no longer required so can go away, we now install cross packages into
the native sysroot and use them from there.

This patch includes updates to classes and some recipes which reference
CROSS_DIR. Others still need fixing an image can be built and run with this
patch applied.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index a04c956c80..cda16d1cc5 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -128,7 +128,6 @@ def pstage_cleanpackage(pkgname, d):
         else:
                 bb.note("No. Manually removing any installed files")
                 pstage_manualclean("sysroots", "STAGING_DIR", d)
-                pstage_manualclean("cross", "CROSS_DIR", d)
                 pstage_manualclean("deploy", "DEPLOY_DIR", d)
 
         bb.utils.unlockfile(lf)
@@ -297,7 +296,6 @@ python packagedstage_stampfixing_eventhandler() {
 populate_sysroot_preamble () {
         if [ "$PSTAGING_ACTIVE" = "1" ]; then
                 stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u || true
-                stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u || true
         fi
 }
 
@@ -313,7 +311,6 @@ populate_sysroot_postamble () {
                 if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
                         exit $exitcode
                 fi
-                stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
                 if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
                         exit $exitcode
                 fi
@@ -324,9 +321,7 @@ populate_sysroot_postamble () {
 packagedstaging_fastpath () {
         if [ "$PSTAGING_ACTIVE" = "1" ]; then
                 mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
-                mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/
                 cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
-                cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
         fi
 }