Skip to contentSkip to conversation

toaster: resolve missing native[sdk]: prefixes

PATCH New brian avery 1 participant 2 messages Mar 6, 2017

lore
Share & tools
lore
#0 lore raw

cover toaster: resolve missing native[sdk]: prefixes

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]

-brian

The following changes since commit 4188e53f803aefdb26768abfad591283662cd27e:

poky: make 4.10 the qemu* default (2017-03-04 23:19:03 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib bavery/toaster/submit/resolve-missing-native-sdk-prefixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/submit/resolve-missing-native-sdk-prefixes

David Reyna (1):
toaster: resolve missing 'native[sdk]:' prefixes

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

--
1.9.1

#1 lore raw

PATCH 1/1 toaster: resolve missing 'native[sdk]:' prefixes

From: David Reyna <[email protected]>

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]

---
 lib/bb/ui/buildinfohelper.py | 8 ++++++++
 1 file changed, 8 insertions(+)
lib/bb/ui/buildinfohelper.py +8 -0
index 5ed150d..92d1a1c 100644
@@ -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(":")
Signature · 1 line
1.9.1