sstatesig: Fix pn and taskname derivation in find_siginfo
PATCH 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] in 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.
Signed-off-by Yang Xu <[email protected]>
--- meta/lib/oe/sstatesig.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta/lib/oe/sstatesig.py +7 -4
@@ -321,10 +321,13 @@ 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:'): + 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] + if affix.startswith('virtual:native'): pn = pn + '-native' hashfiles = {}
Signature · 1 line
2.25.1