toaster: resolve missing 'native[sdk]:' prefixes

Submitted by Reyna, David on March 2, 2017, 12:24 a.m. | Patch ID: 137728

Details

Message ID 1488414272-31634-1-git-send-email-david.reyna@windriver.com
State New
Headers show

Commit Message

Reyna, David March 2, 2017, 12:24 a.m.
From: David Reyna <David.Reyna@windriver.com>

Some task events are missing the 'virtual:native[sdk]:' prefixes.
The Toaster has code to help match missing prefixes, but needs
additional help resolving between 'native:' and 'nativesdk:', by
way of the '_package' event field.

[YOCTO #10849]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 5ed150d..92d1a1c 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -1258,6 +1258,14 @@  class BuildInfoHelper(object):
                 candidates = [x for x in self.internal_state['taskdata'].keys() if x.endswith(identifier)]
                 if len(candidates) == 1:
                     identifier = candidates[0]
+                elif len(candidates) > 1 and hasattr(event,'_package'):
+                    if 'native-' in event._package:
+                        identifier = 'native:' + identifier
+                    if 'nativesdk-' in event._package:
+                        identifier = 'nativesdk:' + identifier
+                    candidates = [x for x in self.internal_state['taskdata'].keys() if x.endswith(identifier)]
+                    if len(candidates) == 1:
+                        identifier = candidates[0]
 
         assert identifier in self.internal_state['taskdata']
         identifierlist = identifier.split(":")

Comments

brian avery March 6, 2017, 10:05 p.m.
submitted to bitbakehttps://patchwork.openembedded.org/patch/137831/

-bavery
an intel employee

On Wed, Mar 1, 2017 at 4:24 PM, David Reyna <david.reyna@windriver.com>
wrote:

> From: David Reyna <David.Reyna@windriver.com>
>
> Some task events are missing the 'virtual:native[sdk]:' prefixes.
> The Toaster has code to help match missing prefixes, but needs
> additional help resolving between 'native:' and 'nativesdk:', by
> way of the '_package' event field.
>
> [YOCTO #10849]
>
> Signed-off-by: David Reyna <David.Reyna@windriver.com>
> ---
>  bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/
> buildinfohelper.py
> index 5ed150d..92d1a1c 100644
> --- a/bitbake/lib/bb/ui/buildinfohelper.py
> +++ b/bitbake/lib/bb/ui/buildinfohelper.py
> @@ -1258,6 +1258,14 @@ class BuildInfoHelper(object):
>                  candidates = [x for x in self.internal_state['taskdata'].keys()
> if x.endswith(identifier)]
>                  if len(candidates) == 1:
>                      identifier = candidates[0]
> +                elif len(candidates) > 1 and hasattr(event,'_package'):
> +                    if 'native-' in event._package:
> +                        identifier = 'native:' + identifier
> +                    if 'nativesdk-' in event._package:
> +                        identifier = 'nativesdk:' + identifier
> +                    candidates = [x for x in
> self.internal_state['taskdata'].keys() if x.endswith(identifier)]
> +                    if len(candidates) == 1:
> +                        identifier = candidates[0]
>
>          assert identifier in self.internal_state['taskdata']
>          identifierlist = identifier.split(":")
> --
> 1.9.1
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>
Reyna, David March 6, 2017, 10:06 p.m.
Thanks! So you updated process seems to work?

- David

From: Brian Avery [mailto:avery.brian@gmail.com]

Sent: Monday, March 06, 2017 2:05 PM
To: Reyna, David
Cc: toaster@yoctoproject.org
Subject: Re: [Toaster] [PATCH] toaster: resolve missing 'native[sdk]:' prefixes


submitted to bitbake

https://patchwork.openembedded.org/patch/137831/
-bavery
an intel employee

On Wed, Mar 1, 2017 at 4:24 PM, David Reyna <david.reyna@windriver.com<mailto:david.reyna@windriver.com>> wrote:
From: David Reyna <David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>>


Some task events are missing the 'virtual:native[sdk]:' prefixes.
The Toaster has code to help match missing prefixes, but needs
additional help resolving between 'native:' and 'nativesdk:', by
way of the '_package' event field.

[YOCTO #10849]

Signed-off-by: David Reyna <David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>>

---
 bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
 1 file changed, 8 insertions(+)

--
1.9.1

--
_______________________________________________
toaster mailing list
toaster@yoctoproject.org<mailto:toaster@yoctoproject.org>
https://lists.yoctoproject.org/listinfo/toaster
brian avery March 6, 2017, 10:07 p.m.
Unfortunately, https://bugzilla.yoctoproject.org/show_bug.cgi?id=11132 is
preventing a full end to end test, so we should reverify this bug fix once
the above is fixed.
-bavery
an intel employee

On Mon, Mar 6, 2017 at 2:05 PM, Brian Avery <avery.brian@gmail.com> wrote:

> submitted to bitbakehttps://patchwork.openembedded.org/patch/137831/
>
> -bavery
> an intel employee
>
> On Wed, Mar 1, 2017 at 4:24 PM, David Reyna <david.reyna@windriver.com>
> wrote:
>
>> From: David Reyna <David.Reyna@windriver.com>
>>
>> Some task events are missing the 'virtual:native[sdk]:' prefixes.
>> The Toaster has code to help match missing prefixes, but needs
>> additional help resolving between 'native:' and 'nativesdk:', by
>> way of the '_package' event field.
>>
>> [YOCTO #10849]
>>
>> Signed-off-by: David Reyna <David.Reyna@windriver.com>
>> ---
>>  bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/bitbake/lib/bb/ui/buildinfohelper.py
>> b/bitbake/lib/bb/ui/buildinfohelper.py
>> index 5ed150d..92d1a1c 100644
>> --- a/bitbake/lib/bb/ui/buildinfohelper.py
>> +++ b/bitbake/lib/bb/ui/buildinfohelper.py
>> @@ -1258,6 +1258,14 @@ class BuildInfoHelper(object):
>>                  candidates = [x for x in self.internal_state['taskdata'].keys()
>> if x.endswith(identifier)]
>>                  if len(candidates) == 1:
>>                      identifier = candidates[0]
>> +                elif len(candidates) > 1 and hasattr(event,'_package'):
>> +                    if 'native-' in event._package:
>> +                        identifier = 'native:' + identifier
>> +                    if 'nativesdk-' in event._package:
>> +                        identifier = 'nativesdk:' + identifier
>> +                    candidates = [x for x in
>> self.internal_state['taskdata'].keys() if x.endswith(identifier)]
>> +                    if len(candidates) == 1:
>> +                        identifier = candidates[0]
>>
>>          assert identifier in self.internal_state['taskdata']
>>          identifierlist = identifier.split(":")
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> toaster mailing list
>> toaster@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/toaster
>>
>
>
brian avery March 8, 2017, 3:23 a.m.
yes. I fixed some of the stuff on the Contribute to Toaster page. Seemed to
work :).
-brian
an intel employee

On Mon, Mar 6, 2017 at 2:06 PM, Reyna, David <david.reyna@windriver.com>
wrote:

> Thanks! So you updated process seems to work?
>
>
>
> - David
>
>
>
> *From:* Brian Avery [mailto:avery.brian@gmail.com]
> *Sent:* Monday, March 06, 2017 2:05 PM
> *To:* Reyna, David
> *Cc:* toaster@yoctoproject.org
> *Subject:* Re: [Toaster] [PATCH] toaster: resolve missing 'native[sdk]:'
> prefixes
>
>
>
> submitted to bitbake
>
> https://patchwork.openembedded.org/patch/137831/
>
> -bavery
>
> an intel employee
>
>
>
> On Wed, Mar 1, 2017 at 4:24 PM, David Reyna <david.reyna@windriver.com>
> wrote:
>
> From: David Reyna <David.Reyna@windriver.com>
>
>
> Some task events are missing the 'virtual:native[sdk]:' prefixes.
> The Toaster has code to help match missing prefixes, but needs
> additional help resolving between 'native:' and 'nativesdk:', by
> way of the '_package' event field.
>
> [YOCTO #10849]
>
> Signed-off-by: David Reyna <David.Reyna@windriver.com>
> ---
>  bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/
> buildinfohelper.py
> index 5ed150d..92d1a1c 100644
> --- a/bitbake/lib/bb/ui/buildinfohelper.py
> +++ b/bitbake/lib/bb/ui/buildinfohelper.py
> @@ -1258,6 +1258,14 @@ class BuildInfoHelper(object):
>                  candidates = [x for x in self.internal_state['taskdata'].keys()
> if x.endswith(identifier)]
>                  if len(candidates) == 1:
>                      identifier = candidates[0]
> +                elif len(candidates) > 1 and hasattr(event,'_package'):
> +                    if 'native-' in event._package:
> +                        identifier = 'native:' + identifier
> +                    if 'nativesdk-' in event._package:
> +                        identifier = 'nativesdk:' + identifier
> +                    candidates = [x for x in
> self.internal_state['taskdata'].keys() if x.endswith(identifier)]
> +                    if len(candidates) == 1:
> +                        identifier = candidates[0]
>
>          assert identifier in self.internal_state['taskdata']
>          identifierlist = identifier.split(":")
> --
> 1.9.1
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>
>
>
Reyna, David March 8, 2017, 3:56 p.m.
I have replicated this error with 10849 fix in my tree, so this is something new. I am working on it.

- David

From: Brian Avery [mailto:avery.brian@gmail.com]

Sent: Monday, March 06, 2017 2:07 PM
To: Reyna, David
Cc: toaster@yoctoproject.org
Subject: Re: [Toaster] [PATCH] toaster: resolve missing 'native[sdk]:' prefixes

Unfortunately, https://bugzilla.yoctoproject.org/show_bug.cgi?id=11132 is preventing a full end to end test, so we should reverify this bug fix once the above is fixed.
-bavery
an intel employee

On Mon, Mar 6, 2017 at 2:05 PM, Brian Avery <avery.brian@gmail.com<mailto:avery.brian@gmail.com>> wrote:

submitted to bitbake

https://patchwork.openembedded.org/patch/137831/
-bavery
an intel employee

On Wed, Mar 1, 2017 at 4:24 PM, David Reyna <david.reyna@windriver.com<mailto:david.reyna@windriver.com>> wrote:
From: David Reyna <David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>>


Some task events are missing the 'virtual:native[sdk]:' prefixes.
The Toaster has code to help match missing prefixes, but needs
additional help resolving between 'native:' and 'nativesdk:', by
way of the '_package' event field.

[YOCTO #10849]

Signed-off-by: David Reyna <David.Reyna@windriver.com<mailto:David.Reyna@windriver.com>>

---
 bitbake/lib/bb/ui/buildinfohelper.py | 8 ++++++++
 1 file changed, 8 insertions(+)

--
1.9.1

--
_______________________________________________
toaster mailing list
toaster@yoctoproject.org<mailto:toaster@yoctoproject.org>
https://lists.yoctoproject.org/listinfo/toaster