[PATCH] Fix packaged staging for cross packages

[Joshua Lock <josh@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

Hi,

While working on packaged staging in Poky I noticed that cross packages
where being incorrectly packaged.

After spending quite some time to track down the issue and fix it I
committed a patch to Poky master[1] to fix it.

Attached is a copy of the patch for packages-staging.bbclass against
oe.dev.

Regards,
Joshua

1.http://git.pokylinux.org/cgit.cgi/poky/commit/?id=538087d2036d9dd319e3a22aaa2f62e5a5285c55
-- 
Joshua Lock
        Intel Open Source Technology Centre

[-- Attachment #2: 0001-packaged-staging-Fix-packagaging-of-cross-packages.patch --]
[-- Type: text/x-patch, Size: 1525 bytes --]

From 76d07ab28c304f1b827ef9b7f8adda22599c67ec Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 4 Mar 2010 17:47:33 +0000
Subject: [PATCH] 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>
---
 classes/packaged-staging.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 1ede25c..1cf30e2 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -289,7 +289,9 @@ 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
+                # 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
 	fi
 }
 
-- 
1.6.6.1