packaged-staging: tweak previous fix to accomodate possible changes to CROSS_DIR

This change, suggested by Chris Larson, ensures that the fix works even if the
definition of CROSS_DIR changes.

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

diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index fca681864dea8da0e565007ea380b8c5bda80464..7e7c648ad9079a06168601a88732fc0fa7fd1e51 100644 (file)
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -321,9 +321,7 @@ packagedstaging_fastpath () {
                mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
                mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
                cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
-                # CROSS_DIR is just the HOST_ARCH specific stuff and a sub
-                # directory of cross so copy it *and* its contents
-               cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR} ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
+               cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
        fi
 }