Re: [OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for cross recipes.

2022-03-02 Thread Richard Purdie 
On Wed, 2022-03-02 at 09:49 +0100, Alexander Kanavin wrote:
> I just ran this locally, and it passed - probably caused by a different 
> commit?

I suspect Ross has a change which may be to blame...

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162605): 
https://lists.openembedded.org/g/openembedded-core/message/162605
Mute This Topic: https://lists.openembedded.org/mt/89396615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for cross recipes.

2022-03-02 Thread Alexander Kanavin 
I just ran this locally, and it passed - probably caused by a different commit?

Alex

On Wed, 2 Mar 2022 at 08:24, Lee, Chee Yang  wrote:
>
> Need to update selftest too?
>
> sstatetests.SStateTests.test_sstate_allarch_samesigs
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/3234/steps/14/logs/stdio
>
>
> > -Original Message-
> > From: openembedded-core@lists.openembedded.org  > c...@lists.openembedded.org> On Behalf Of Alexander Kanavin
> > Sent: Saturday, 26 February, 2022 11:02 PM
> > To: openembedded-core@lists.openembedded.org
> > Cc: Alexander Kanavin 
> > Subject: [OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for
> > cross recipes.
> >
> > This is redundant (target arch is already in PN), and breaks compiling a 
> > cross-
> > canadian toolchain, as that needs populating the sysroot with two different
> > native-hosted toolchains built from cross recipes. Inserting TARGET_ARCH
> > allows only one or the other.
> >
> > Signed-off-by: Alexander Kanavin 
> > ---
> >  meta/classes/sstate.bbclass | 3 +--
> >  meta/lib/oe/sstatesig.py| 2 +-
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index
> > 787172b408..dc9a2c085b 100644
> > --- a/meta/classes/sstate.bbclass
> > +++ b/meta/classes/sstate.bbclass
> > @@ -83,7 +83,6 @@ SSTATE_ARCHS = " \
> >  ${BUILD_ARCH} \
> >  ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \
> >  ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \
> > -${BUILD_ARCH}_${TARGET_ARCH} \
> >  ${SDK_ARCH}_${SDK_OS} \
> >  ${SDK_ARCH}_${PACKAGE_ARCH} \
> >  allarch \
> > @@ -138,7 +137,7 @@ python () {
> >  elif bb.data.inherits_class('crosssdk', d):
> >  d.setVar('SSTATE_PKGARCH',
> > d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
> >  elif bb.data.inherits_class('cross', d):
> > -d.setVar('SSTATE_PKGARCH',
> > d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
> > +d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}"))
> >  elif bb.data.inherits_class('nativesdk', d):
> >  d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
> >  elif bb.data.inherits_class('cross-canadian', d):
> > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index
> > abcd96231e..2cf858e201 100644
> > --- a/meta/lib/oe/sstatesig.py
> > +++ b/meta/lib/oe/sstatesig.py
> > @@ -443,7 +443,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname,
> > d, multilibcache):
> >  elif "-cross-canadian" in taskdata:
> >  pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
> >  elif "-cross-" in taskdata:
> > -pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"]
> > +pkgarchs = ["${BUILD_ARCH}"]
> >  elif "-crosssdk" in taskdata:
> >  pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
> >  else:
> > --
> > 2.20.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162599): 
https://lists.openembedded.org/g/openembedded-core/message/162599
Mute This Topic: https://lists.openembedded.org/mt/89396615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for cross recipes.

2022-03-01 Thread Lee Chee Yang 
Need to update selftest too? 

sstatetests.SStateTests.test_sstate_allarch_samesigs 

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/3234/steps/14/logs/stdio


> -Original Message-
> From: openembedded-core@lists.openembedded.org  c...@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: Saturday, 26 February, 2022 11:02 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin 
> Subject: [OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for
> cross recipes.
> 
> This is redundant (target arch is already in PN), and breaks compiling a 
> cross-
> canadian toolchain, as that needs populating the sysroot with two different
> native-hosted toolchains built from cross recipes. Inserting TARGET_ARCH
> allows only one or the other.
> 
> Signed-off-by: Alexander Kanavin 
> ---
>  meta/classes/sstate.bbclass | 3 +--
>  meta/lib/oe/sstatesig.py| 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index
> 787172b408..dc9a2c085b 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -83,7 +83,6 @@ SSTATE_ARCHS = " \
>  ${BUILD_ARCH} \
>  ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \
>  ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \
> -${BUILD_ARCH}_${TARGET_ARCH} \
>  ${SDK_ARCH}_${SDK_OS} \
>  ${SDK_ARCH}_${PACKAGE_ARCH} \
>  allarch \
> @@ -138,7 +137,7 @@ python () {
>  elif bb.data.inherits_class('crosssdk', d):
>  d.setVar('SSTATE_PKGARCH',
> d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
>  elif bb.data.inherits_class('cross', d):
> -d.setVar('SSTATE_PKGARCH',
> d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
> +d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}"))
>  elif bb.data.inherits_class('nativesdk', d):
>  d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
>  elif bb.data.inherits_class('cross-canadian', d):
> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index
> abcd96231e..2cf858e201 100644
> --- a/meta/lib/oe/sstatesig.py
> +++ b/meta/lib/oe/sstatesig.py
> @@ -443,7 +443,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname,
> d, multilibcache):
>  elif "-cross-canadian" in taskdata:
>  pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
>  elif "-cross-" in taskdata:
> -pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"]
> +pkgarchs = ["${BUILD_ARCH}"]
>  elif "-crosssdk" in taskdata:
>  pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
>  else:
> --
> 2.20.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162594): 
https://lists.openembedded.org/g/openembedded-core/message/162594
Mute This Topic: https://lists.openembedded.org/mt/89396615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for cross recipes.

2022-02-26 Thread Alexander Kanavin 
This is redundant (target arch is already in PN), and breaks
compiling a cross-canadian toolchain, as that needs populating the
sysroot with two different native-hosted toolchains built from
cross recipes. Inserting TARGET_ARCH allows only one or the other.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/sstate.bbclass | 3 +--
 meta/lib/oe/sstatesig.py| 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 787172b408..dc9a2c085b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -83,7 +83,6 @@ SSTATE_ARCHS = " \
 ${BUILD_ARCH} \
 ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \
 ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \
-${BUILD_ARCH}_${TARGET_ARCH} \
 ${SDK_ARCH}_${SDK_OS} \
 ${SDK_ARCH}_${PACKAGE_ARCH} \
 allarch \
@@ -138,7 +137,7 @@ python () {
 elif bb.data.inherits_class('crosssdk', d):
 d.setVar('SSTATE_PKGARCH', 
d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
 elif bb.data.inherits_class('cross', d):
-d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
+d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}"))
 elif bb.data.inherits_class('nativesdk', d):
 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
 elif bb.data.inherits_class('cross-canadian', d):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index abcd96231e..2cf858e201 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -443,7 +443,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, 
multilibcache):
 elif "-cross-canadian" in taskdata:
 pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
 elif "-cross-" in taskdata:
-pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"]
+pkgarchs = ["${BUILD_ARCH}"]
 elif "-crosssdk" in taskdata:
 pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
 else:
-- 
2.20.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162425): 
https://lists.openembedded.org/g/openembedded-core/message/162425
Mute This Topic: https://lists.openembedded.org/mt/89396615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH 1/2] sstate: do not add TARGET_ARCH to pkgarch for cross recipes.

2022-02-25 Thread Alexander Kanavin 
This is redundant (target arch is already in PN), and breaks
compiling a cross-canadian toolchain, as that needs populating the
sysroot with two different native-hosted toolchains built from
cross recipes. Inserting TARGET_ARCH allows only one or the other.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/sstate.bbclass | 3 +--
 meta/lib/oe/sstatesig.py| 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 787172b408..dc9a2c085b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -83,7 +83,6 @@ SSTATE_ARCHS = " \
 ${BUILD_ARCH} \
 ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \
 ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \
-${BUILD_ARCH}_${TARGET_ARCH} \
 ${SDK_ARCH}_${SDK_OS} \
 ${SDK_ARCH}_${PACKAGE_ARCH} \
 allarch \
@@ -138,7 +137,7 @@ python () {
 elif bb.data.inherits_class('crosssdk', d):
 d.setVar('SSTATE_PKGARCH', 
d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
 elif bb.data.inherits_class('cross', d):
-d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
+d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}"))
 elif bb.data.inherits_class('nativesdk', d):
 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
 elif bb.data.inherits_class('cross-canadian', d):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index abcd96231e..2cf858e201 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -443,7 +443,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, 
multilibcache):
 elif "-cross-canadian" in taskdata:
 pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
 elif "-cross-" in taskdata:
-pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"]
+pkgarchs = ["${BUILD_ARCH}"]
 elif "-crosssdk" in taskdata:
 pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
 else:
-- 
2.20.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162409): 
https://lists.openembedded.org/g/openembedded-core/message/162409
Mute This Topic: https://lists.openembedded.org/mt/89396615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-