* [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot
@ 2017-01-24 13:50 Maciej Borzecki
2017-01-24 22:05 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Maciej Borzecki @ 2017-01-24 13:50 UTC (permalink / raw)
To: openembedded-core; +Cc: Maciej Borzecki
Recipe sysroots introduced a change where dependencies ending with "-cross" also
count as native tools and (see setscene_depvalid() for details).
The same logic was missing from extend_recipe_sysroot(), hence for depency named
`go-cross` the manifest file would default to
`manifest-allarch-go-cross.populate_sysroot`, while the correct name is
`manifest-x86_64_arm-go-cross.populate_sysroot`
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
---
meta/classes/staging.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index fc387eaf4bb52971e111ae7deac7d7d6fc389337..efea450e4f73661366d0929d5c39e42bfe9f8e8b 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -521,7 +521,7 @@ python extend_recipe_sysroot() {
native = True
elif c.startswith("nativesdk-"):
manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
- elif "-cross-" in c:
+ elif "-cross-" in c or c.endswith("-cross"):
manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
native = True
elif "-crosssdk" in c:
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot
2017-01-24 13:50 [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot Maciej Borzecki
@ 2017-01-24 22:05 ` Khem Raj
2017-01-24 22:08 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2017-01-24 22:05 UTC (permalink / raw)
To: openembedded-core
On 1/24/17 5:50 AM, Maciej Borzecki wrote:
> Recipe sysroots introduced a change where dependencies ending with "-cross" also
> count as native tools and (see setscene_depvalid() for details).
>
> The same logic was missing from extend_recipe_sysroot(), hence for depency named
> `go-cross` the manifest file would default to
> `manifest-allarch-go-cross.populate_sysroot`, while the correct name is
> `manifest-x86_64_arm-go-cross.populate_sysroot`
>
> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> ---
> meta/classes/staging.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
> index fc387eaf4bb52971e111ae7deac7d7d6fc389337..efea450e4f73661366d0929d5c39e42bfe9f8e8b 100644
> --- a/meta/classes/staging.bbclass
> +++ b/meta/classes/staging.bbclass
> @@ -521,7 +521,7 @@ python extend_recipe_sysroot() {
> native = True
> elif c.startswith("nativesdk-"):
> manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
> - elif "-cross-" in c:
> + elif "-cross-" in c or c.endswith("-cross"):
Perhaps you can change the go cross recipe to use something like
PN = "go-cross-${TARGET_ARCH}"
> manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
> native = True
> elif "-crosssdk" in c:
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot
2017-01-24 22:05 ` Khem Raj
@ 2017-01-24 22:08 ` Richard Purdie
2017-01-24 22:14 ` Maciej Borzęcki
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2017-01-24 22:08 UTC (permalink / raw)
To: Khem Raj, openembedded-core
On Tue, 2017-01-24 at 14:05 -0800, Khem Raj wrote:
>
> On 1/24/17 5:50 AM, Maciej Borzecki wrote:
> >
> > Recipe sysroots introduced a change where dependencies ending with
> > "-cross" also
> > count as native tools and (see setscene_depvalid() for details).
> >
> > The same logic was missing from extend_recipe_sysroot(), hence for
> > depency named
> > `go-cross` the manifest file would default to
> > `manifest-allarch-go-cross.populate_sysroot`, while the correct
> > name is
> > `manifest-x86_64_arm-go-cross.populate_sysroot`
> >
> > Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> > ---
> > meta/classes/staging.bbclass | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/staging.bbclass
> > b/meta/classes/staging.bbclass
> > index
> > fc387eaf4bb52971e111ae7deac7d7d6fc389337..efea450e4f73661366d0929d5
> > c39e42bfe9f8e8b 100644
> > --- a/meta/classes/staging.bbclass
> > +++ b/meta/classes/staging.bbclass
> > @@ -521,7 +521,7 @@ python extend_recipe_sysroot() {
> > native = True
> > elif c.startswith("nativesdk-"):
> > manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-
> > ${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
> > - elif "-cross-" in c:
> > + elif "-cross-" in c or c.endswith("-cross"):
> Perhaps you can change the go cross recipe to use something like
>
> PN = "go-cross-${TARGET_ARCH}"
>
> >
> > manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-
> > ${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
> > native = True
> > elif "-crosssdk" in c:
> >
FWIW the patch as it stands is going to cause problems since for
example qemuwrapper-cross doesn't inherit cross.bbclass (nor should it)
and will fail the manifest tests if we change it to include *-cross :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot
2017-01-24 22:08 ` Richard Purdie
@ 2017-01-24 22:14 ` Maciej Borzęcki
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Borzęcki @ 2017-01-24 22:14 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Tue, Jan 24, 2017 at 11:08 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2017-01-24 at 14:05 -0800, Khem Raj wrote:
>>
>> On 1/24/17 5:50 AM, Maciej Borzecki wrote:
>> >
>> > Recipe sysroots introduced a change where dependencies ending with
>> > "-cross" also
>> > count as native tools and (see setscene_depvalid() for details).
>> >
>> > The same logic was missing from extend_recipe_sysroot(), hence for
>> > depency named
>> > `go-cross` the manifest file would default to
>> > `manifest-allarch-go-cross.populate_sysroot`, while the correct
>> > name is
>> > `manifest-x86_64_arm-go-cross.populate_sysroot`
>> >
>> > Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
>> > ---
>> > meta/classes/staging.bbclass | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/meta/classes/staging.bbclass
>> > b/meta/classes/staging.bbclass
>> > index
>> > fc387eaf4bb52971e111ae7deac7d7d6fc389337..efea450e4f73661366d0929d5
>> > c39e42bfe9f8e8b 100644
>> > --- a/meta/classes/staging.bbclass
>> > +++ b/meta/classes/staging.bbclass
>> > @@ -521,7 +521,7 @@ python extend_recipe_sysroot() {
>> > native = True
>> > elif c.startswith("nativesdk-"):
>> > manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-
>> > ${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
>> > - elif "-cross-" in c:
>> > + elif "-cross-" in c or c.endswith("-cross"):
>> Perhaps you can change the go cross recipe to use something like
>>
>> PN = "go-cross-${TARGET_ARCH}"
>>
>> >
>> > manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-
>> > ${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
>> > native = True
>> > elif "-crosssdk" in c:
>> >
>
> FWIW the patch as it stands is going to cause problems since for
> example qemuwrapper-cross doesn't inherit cross.bbclass (nor should it)
> and will fail the manifest tests if we change it to include *-cross :(
>
Hmm I was misled by
https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/sstate.bbclass#n924
Khem's suggestion makes more sense though, I'll try to get it fixed in
oe-meta-go instead.
Cheers,
--
Maciej Borzecki
RnDity
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-24 22:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24 13:50 [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot Maciej Borzecki
2017-01-24 22:05 ` Khem Raj
2017-01-24 22:08 ` Richard Purdie
2017-01-24 22:14 ` Maciej Borzęcki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox