Re: [PATCH] Fix packaged staging for cross packages

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

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

Hi Chris,

On Thu, 2010-03-04 at 13:42 -0600, Chris Larson wrote:
> It looks like this does fix the problem, and good job in spotting the
> problem, but this fix assumes that the basename of CROSS_DIR is
> BASE_PACKAGE_ARCH.  If that ever changes for whatever reason, it will break.
>  I'd suggest instead changing it to continue to copy the contents of the
> dir, but to change the destination to match the destination used in the
> postamble (${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}).

Thanks for the quick review, I've attached a modified patch to account
for potential changes in the base name of CROSS_DIR as suggested.

Regards,
Joshua
-- 
Joshua Lock
        Intel Open Source Technology Centre

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

From f40c45b8cba055d698e22c2b7444bc21c5a47eb8 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Fri, 5 Mar 2010 08:23:39 +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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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