From 3bf06027130ca15cecbdf7f804a4e5153c4ce781 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 23 Feb 2019 10:27:30 +0000
Subject: 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>
---
 bitbake/lib/bb/siggen.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bitbake')

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):
                 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
-- 
cgit v1.2.3-54-g00ecf