aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-04 22:34:20 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-17 12:17:15 +0000
commitf94496c1c245882df0e2f8c9fb94774c8c9b3ce0 (patch)
tree8c04ba62d7dff49e888c9d95e63fc1d545316603 /classes
parent00e29e85c140430b3e6e398a0191979f4d94a93e (diff)
downloadopenembedded-f94496c1c245882df0e2f8c9fb94774c8c9b3ce0.tar.gz
packaged-staging: Fix packagaging of cross packages
packagedstaging_fastpath() was only copying the contents of CROSS_DIR to PSTAGE_TMPDIR resulting in the folders contents being packaged and then installed incorrectly at the top level of CROSS_DIR rather than in HOST_ARCH specific sub directories. This patch fixes that issue by copying the directory and its contents rather than just the directory contents. Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/packaged-staging.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index da9d0f34c6..f755d2340d 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -298,7 +298,7 @@ packagedstaging_fastpath () {
mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
- 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
}