[OE-core] [PATCH] archiver: preserve sysroot paths in configured mode for multilib

[Hongxu Jia]

In the following commit, the archiver expanded RECIPE_SYSROOT
to preserve sysroot paths in configured mode:
...
commit aa2240657b015d46e9ba4bcb6264709a82313d83
Author: Ross Burton 
Date:   Tue Jun 6 15:23:18 2017 +0100

archiver: preserve sysroot paths in configured mode
...

In meta/conf/multilib.conf, it overrides the variables
of STAGING_DIR_HOST, STAGING_DIR_TARGET and RECIPE_SYSROOT
with "${WORKDIR}/${MLPREFIX}recipe-sysroot".

So the archiver should also expand STAGING_DIR_HOST and
STAGING_DIR_TARGET to preserve sysroot paths in configured mode for
multilib.

[YOCTO #11584]

Signed-off-by: Hongxu Jia 
---
 meta/classes/archiver.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 18c5b96..ec80ad4 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -223,6 +223,8 @@ python do_ar_configured() {
 import shutil
 
 # Forcibly expand the sysroot paths as we're about to change WORKDIR
+d.setVar('STAGING_DIR_HOST', d.getVar('STAGING_DIR_HOST'))
+d.setVar('STAGING_DIR_TARGET', d.getVar('STAGING_DIR_TARGET'))
 d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT'))
 d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE'))
 
-- 
1.8.3.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] archiver: preserve sysroot paths in configured mode

[Leonardo Sandoval]

On Tue, 2017-06-06 at 16:58 +0100, Burton, Ross wrote:
> 
> On 6 June 2017 at 16:42, Mikko Ylinen 
> wrote:
> This patch is not enough because the problem is in
> do_unpack_and_patch which
> is shared by most archiver modes. This patch fails, e.g., with
> "original + diff"
> 
> https://patchwork.openembedded.org/series/7068/
> 
> 
> Yes, I have yours in my branch too.  There's many ways that the
> archiver can fail right now, clearly we need to exercise it a bit more
> in selftest.
> 
Right, and this bug tracks the progress

https://bugzilla.yoctoproject.org/show_bug.cgi?id=11422

> 
> Ross
> -- 
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] archiver: preserve sysroot paths in configured mode

[Burton, Ross]

On 6 June 2017 at 16:42, Mikko Ylinen  wrote:

> This patch is not enough because the problem is in do_unpack_and_patch
> which
> is shared by most archiver modes. This patch fails, e.g., with "original +
> diff"
>
> https://patchwork.openembedded.org/series/7068/
>

Yes, I have yours in my branch too.  There's many ways that the archiver
can fail right now, clearly we need to exercise it a bit more in selftest.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] archiver: preserve sysroot paths in configured mode

[Mikko Ylinen]

On 06/06/17 18:03, Ross Burton wrote:

do_ar_configured alters WORKDIR but also expects to be able to run do_configure,
so forcibly expand the paths to the sysroots as otherwise they'll point to a
non-existant directory in the temporary WORKDIR.

[ YOCTO #11584 ]



This patch is not enough because the problem is in do_unpack_and_patch which
is shared by most archiver modes. This patch fails, e.g., with "original 
+ diff"


https://patchwork.openembedded.org/series/7068/

-- Mikko



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] archiver: preserve sysroot paths in configured mode

[Ross Burton]

do_ar_configured alters WORKDIR but also expects to be able to run do_configure,
so forcibly expand the paths to the sysroots as otherwise they'll point to a
non-existant directory in the temporary WORKDIR.

[ YOCTO #11584 ]

Signed-off-by: Ross Burton 
---
 meta/classes/archiver.bbclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 82f0b16..18c5b96 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -222,6 +222,10 @@ python do_ar_patched() {
 python do_ar_configured() {
 import shutil
 
+# Forcibly expand the sysroot paths as we're about to change WORKDIR
+d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT'))
+d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE'))
+
 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
 if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
 bb.note('Archiving the configured source...')
-- 
2.8.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core