* [PATCH] Fix packaged staging for cross packages
@ 2010-03-04 17:54 Joshua Lock
2010-03-04 19:42 ` Chris Larson
0 siblings, 1 reply; 4+ messages in thread
From: Joshua Lock @ 2010-03-04 17:54 UTC (permalink / raw)
To: openembedded-devel
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Fix packaged staging for cross packages
2010-03-04 17:54 [PATCH] Fix packaged staging for cross packages Joshua Lock
@ 2010-03-04 19:42 ` Chris Larson
2010-03-05 8:34 ` Joshua Lock
0 siblings, 1 reply; 4+ messages in thread
From: Chris Larson @ 2010-03-04 19:42 UTC (permalink / raw)
To: openembedded-devel
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}).
On Thu, Mar 4, 2010 at 11:54 AM, Joshua Lock <josh@linux.intel.com> wrote:
> 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
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix packaged staging for cross packages
2010-03-04 19:42 ` Chris Larson
@ 2010-03-05 8:34 ` Joshua Lock
2010-03-21 0:35 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Joshua Lock @ 2010-03-05 8:34 UTC (permalink / raw)
To: openembedded-devel
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Fix packaged staging for cross packages
2010-03-05 8:34 ` Joshua Lock
@ 2010-03-21 0:35 ` Khem Raj
0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2010-03-21 0:35 UTC (permalink / raw)
To: openembedded-devel
On (05/03/10 08:34), Joshua Lock wrote:
> 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
> 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>
Acked-by: Khem Raj <raj.khem@gmail.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
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-21 0:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04 17:54 [PATCH] Fix packaged staging for cross packages Joshua Lock
2010-03-04 19:42 ` Chris Larson
2010-03-05 8:34 ` Joshua Lock
2010-03-21 0:35 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.