diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-23 10:27:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:33:05 +0000 |
commit | 50b98006310d9b3238c0516d1e795d54ff408797 (patch) | |
tree | 26ac355e21a6bb86d7232c231f1928733a771cf3 /bitbake/lib | |
parent | f19652fc3f25406838b1ab69b1831929c39179fd (diff) | |
download | poky-50b98006310d9b3238c0516d1e795d54ff408797.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: 3d4e557a539a8ef4a3b7a1e36fc99b118c01cbf4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index fdbb2a3998..352dcab853 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -181,6 +181,8 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
181 | depmc = pkgname.split(':')[1] | 181 | depmc = pkgname.split(':')[1] |
182 | if mc != depmc: | 182 | if mc != depmc: |
183 | continue | 183 | continue |
184 | if dep.startswith("multiconfig:") and not mc: | ||
185 | continue | ||
184 | depname = dataCache.pkg_fn[pkgname] | 186 | depname = dataCache.pkg_fn[pkgname] |
185 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): | 187 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): |
186 | continue | 188 | continue |