Skip to contentSkip to conversation

sstatesig: Fix pn and taskname derivation in find_siginfo

PATCH Superseded [email protected] 2 participants 3 messages Jul 4, 2023

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sstatesig: Fix pn and taskname derivation in find_siginfo

From: Yang Xu <[email protected]>

The bb.siggen.compare_sigfiles method transforms the key format from [mc:<mc_name>:][virtual:][native:]<recipe path>:<taskname> to <recipe dir>/<recipe name>:<taskname>[:virtual][:native][:mc:<mc_name>] by clean_basepaths. However, find_siginfo uses the original format to get the package name (pn) and task name.

This commit corrects the method for deriving the pn and task name in find_siginfo and adds handling for multilib name.

---
 meta/lib/oe/sstatesig.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
meta/lib/oe/sstatesig.py +12 -5
index f943df181e..f041a0c430 100644
@@ -321,11 +321,18 @@ def find_siginfo(pn, taskname, taskhashlist, d):
     if not taskname:
         # We have to derive pn and taskname
         key = pn
-        splitit = key.split('.bb:')
-        taskname = splitit[1]
-        pn = os.path.basename(splitit[0]).split('_')[0]
-        if key.startswith('virtual:native:'):
-            pn = pn + '-native'
+        if key.count(':') >= 2:
+            splitit, taskname, affix = key.split(':', 2)
+        else:
+            splitit, taskname = key.split(':', 1)
+            affix = ''
+        pn = os.path.splitext(os.path.basename(splitit))[0].split('_')[0]
+        affixitems = affix.split(':')
+        if affixitems[0] == 'virtual':
+            if affixitems[1] == 'native':
+                pn = pn + '-native'
+            if affixitems[1] == 'multilib':
+                pn = affixitems[2] + '-' + pn
 
     hashfiles = {}
     filedates = {}
Signature · 1 line
2.25.1
#1 lore raw
Quoted 32 lines · Yang Xu via lists.openembedded.org

From: Yang Xu <[email protected]>

The bb.siggen.compare_sigfiles method transforms the key format from [mc:<mc_name>:][virtual:][native:]<recipe path>:<taskname> to <recipe dir>/<recipe name>:<taskname>[:virtual][:native][:mc:<mc_name>] by clean_basepaths. However, find_siginfo uses the original format to get the package name (pn) and task name.

This commit corrects the method for deriving the pn and task name in find_siginfo and adds handling for multilib name.

---
meta/lib/oe/sstatesig.py | 17 ++++++++++++-----

1 file changed, 12 insertions(+), 5 deletions(-)
meta/lib/oe/sstatesig.py +2 -5
index f943df181e..f041a0c430 100644
@@ -321,11 +321,18 @@ def find_siginfo(pn, taskname, taskhashlist, d):
    if not taskname:
        # We have to derive pn and taskname
        key = pn
-        splitit = key.split('.bb:')
-        taskname = splitit[1]
-        pn = os.path.basename(splitit[0]).split('_')[0]
-        if key.startswith('virtual:native:'):
-            pn = pn + '-native'
+        if key.count(':') >= 2:
+            splitit, taskname, affix = key.split(':', 2)

meta/lib/oe/sstatesig.py def find_siginfo(pn, taskname, taskhashlist, d): · line 335

Quoted 10 lines
meta/lib/oe/sstatesig.py +10 -0
+        else:
+            splitit, taskname = key.split(':', 1)
+            affix = ''
+        pn = os.path.splitext(os.path.basename(splitit))[0].split('_')[0]
+        affixitems = affix.split(':')
+        if affixitems[0] == 'virtual':
+            if affixitems[1] == 'native':
+                pn = pn + '-native'
+            if affixitems[1] == 'multilib':
+                pn = affixitems[2] + '-' + pn

How did you notice this problem, what’s the actual change between this and v1, and more importantly can we add a test case for this obviously complex code?

Ross

#2 lore raw

When I investiage some package tasks cache missing problem by bitbake-diffsigs, I found that 'find_siginfo' called by bitbake-diffsigs is unable to construct the correct package name(pn) when dealing with virtual targets.

Patch v2 introduces handling for 'lib64-' and 'lib32-' case besides '-native' case.

And for test case, I'm currently not familiar with oe-selftest.However, I will learn how to add test case to oe-selftest and will attempt to write a test case for this.

Thank you.

Yang

Quoted 67 lines · Ross Burton

The bb.siggen.compare_sigfiles method transforms the key format from

[mc:<mc_name>:][virtual:][native:]<recipe path>:<taskname> to

<recipe dir>/<recipe name>:<taskname>[:virtual][:native][:mc:<mc_name>]

by clean_basepaths. However, find_siginfo uses the original format

to get the package name (pn) and task name.

This commit corrects the method for deriving the pn and task name in

find_siginfo and adds handling for multilib name.

---

meta/lib/oe/sstatesig.py | 17 ++++++++++++-----

1 file changed, 12 insertions(+), 5 deletions(-)
meta/lib/oe/sstatesig.py +0 -0

index f943df181e..f041a0c430 100644

--- a/meta/lib/oe/sstatesig.py

+++ b/meta/lib/oe/sstatesig.py

meta/lib/oe/sstatesig.py +7 -5
@@ -321,11 +321,18 @@ def find_siginfo(pn, taskname, taskhashlist, d):
 
    if not taskname:
 
        # We have to derive pn and taskname
 
        key = pn
 
-        splitit = key.split('.bb:')
 
-        taskname = splitit[1]
 
-        pn = os.path.basename(splitit[0]).split('_')[0]
 
-        if key.startswith('virtual:native:'):
 
-            pn = pn + '-native'
 
+        if key.count(':') >= 2:
 
+            splitit, taskname, affix = key.split(':', 2)
 
+        else:
 
+            splitit, taskname = key.split(':', 1)
 
+            affix = ''
 
+        pn = os.path.splitext(os.path.basename(splitit))[0].split('_')[0]
 
+        affixitems = affix.split(':')

meta/lib/oe/sstatesig.py def find_siginfo(pn, taskname, taskhashlist, d):

Quoted 10 lines
meta/lib/oe/sstatesig.py +5 -0
 
+        if affixitems[0] == 'virtual':
 
+            if affixitems[1] == 'native':
 
+                pn = pn + '-native'
 
+            if affixitems[1] == 'multilib':
 
+                pn = affixitems[2] + '-' + pn

How did you notice this problem, what’s the actual change between this and v1, and more importantly can we add a test case for this obviously complex code?

Ross