From 28f7dd3ca773458d74d21f405be5f9e61668990a Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 5 Mar 2010 08:35:46 +0000 Subject: 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 --- meta/classes/packaged-staging.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index fca681864d..7e7c648ad9 100644 --- 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 } -- cgit v1.2.3-54-g00ecf