aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-23 10:27:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-23 10:40:19 +0000
commitc883dfe378af9dfc192a8e392e84325d68648806 (patch)
tree970aef370f0042d47aee2673b365dfeb04418a10
parent531dcd221a10853f45cc057b52bb2d5083e0ee42 (diff)
downloadbitbake-contrib-c883dfe378af9dfc192a8e392e84325d68648806.tar.gz
siggen: Fix multiconfig corner case
There was already a fix to ignore some multiconfig dependencies but its 'opposite' case wasn't covered. Cover that combination to so as to avoid tracebacks in multiconfig builds. [YOCTO #13090] [YOCTO #13130] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/siggen.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 03aa08bb9..09c9c8a25 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -184,6 +184,8 @@ class SignatureGeneratorBasic(SignatureGenerator):
depmc = pkgname.split(':')[1]
if mc != depmc:
continue
+ if dep.startswith("multiconfig:") and not mc:
+ continue
depname = dataCache.pkg_fn[pkgname]
if not self.rundep_check(fn, recipename, task, dep, depname, dataCache):
continue