summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/command.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-20 17:58:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-21 16:57:43 +0100
commit0aff94023f931a84d21069d92522e0f5338f09a4 (patch)
treecaaf28fbbf2733651110078a8d1c1d2454705da0 /bitbake/lib/bb/command.py
parentcc985986f92186ef73b4dd54f20036f3b351b80e (diff)
downloadpoky-0aff94023f931a84d21069d92522e0f5338f09a4.tar.gz
bitbake: cooker: Fix unmatched files handling leading to misleading warnings
Currently if all recipes in a layer are skipped, there are warnings that the BBFILE_PATTERN_ entry didn't match anything. We probably shouldn't do this for skipped recipes. The current code is hard to understand, not least as it passes variables which functions modify by reference rather than giving a return value. Update calc_bbfile_priority() to return values rather than modifying them. Refactor the code to try and make it clearer what its doing and fix the skipped recipe issue by passing in the list of parsed files. The function is complicated by the need to not rerun regex matching more than we ever have to which complicates the flow, it would be easier if we just reran operations multiple times. (Bitbake rev: 969cb27b4d978551817612ff4558bec81cfb655c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/command.py')
-rw-r--r--bitbake/lib/bb/command.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 3902ccca71..805ed9216c 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -396,7 +396,7 @@ class CommandsSync:
396 def sortkey(x): 396 def sortkey(x):
397 vfn, _ = x 397 vfn, _ = x
398 realfn, _, mc = bb.cache.virtualfn2realfn(vfn) 398 realfn, _, mc = bb.cache.virtualfn2realfn(vfn)
399 return (-command.cooker.collections[mc].calc_bbfile_priority(realfn), vfn) 399 return (-command.cooker.collections[mc].calc_bbfile_priority(realfn)[0], vfn)
400 400
401 skipdict = OrderedDict(sorted(command.cooker.skiplist.items(), key=sortkey)) 401 skipdict = OrderedDict(sorted(command.cooker.skiplist.items(), key=sortkey))
402 return list(skipdict.items()) 402 return list(skipdict.items())