packaged-staging: Fix packagaging of cross packages
authorJoshua Lock <josh@linux.intel.com>
Thu, 4 Mar 2010 22:34:20 +0000 (22:34 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 17 Mar 2010 12:17:15 +0000 (12:17 +0000)
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>
classes/packaged-staging.bbclass

index da9d0f3..f755d23 100644 (file)
@@ -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
 }