summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-05 08:35:46 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-05 08:35:46 +0000
commit28f7dd3ca773458d74d21f405be5f9e61668990a (patch)
treee8e2445e464367cd8e5149761955edfc2e3c3ec1 /meta
parent538087d2036d9dd319e3a22aaa2f62e5a5285c55 (diff)
downloadopenembedded-core-28f7dd3ca773458d74d21f405be5f9e61668990a.tar.gz
openembedded-core-28f7dd3ca773458d74d21f405be5f9e61668990a.tar.bz2
openembedded-core-28f7dd3ca773458d74d21f405be5f9e61668990a.tar.xz
openembedded-core-28f7dd3ca773458d74d21f405be5f9e61668990a.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index fca681864..7e7c648ad 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
}