summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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-25 10:43:31 +0000
commit3bf06027130ca15cecbdf7f804a4e5153c4ce781 (patch)
tree3e1b48a0073708309b1735d598a24a32a6d4fa59 /bitbake/lib/bb
parent0b19e52b85cbd9554df4df9fae50b3b193376aaa (diff)
downloadpoky-3bf06027130ca15cecbdf7f804a4e5153c4ce781.tar.gz
bitbake: 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] (Bitbake rev: c883dfe378af9dfc192a8e392e84325d68648806) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/siggen.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 03aa08bb94..09c9c8a25f 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -184,6 +184,8 @@ class SignatureGeneratorBasic(SignatureGenerator):
184 depmc = pkgname.split(':')[1] 184 depmc = pkgname.split(':')[1]
185 if mc != depmc: 185 if mc != depmc:
186 continue 186 continue
187 if dep.startswith("multiconfig:") and not mc:
188 continue
187 depname = dataCache.pkg_fn[pkgname] 189 depname = dataCache.pkg_fn[pkgname]
188 if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): 190 if not self.rundep_check(fn, recipename, task, dep, depname, dataCache):
189 continue 191 continue