diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 08593d114a..6da9291f9c 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -744,19 +744,18 @@ class BBCooker: | |||
| 744 | taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) | 744 | taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) |
| 745 | mcdeps |= set(taskdata[mc].get_mcdepends()) | 745 | mcdeps |= set(taskdata[mc].get_mcdepends()) |
| 746 | new = False | 746 | new = False |
| 747 | for mc in self.multiconfigs: | 747 | for k in mcdeps: |
| 748 | for k in mcdeps: | 748 | if k in seen: |
| 749 | if k in seen: | 749 | continue |
| 750 | continue | 750 | l = k.split(':') |
| 751 | l = k.split(':') | 751 | depmc = l[2] |
| 752 | depmc = l[2] | 752 | if depmc not in self.multiconfigs: |
| 753 | if depmc not in self.multiconfigs: | 753 | bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) |
| 754 | bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) | 754 | else: |
| 755 | else: | 755 | logger.debug("Adding providers for multiconfig dependency %s" % l[3]) |
| 756 | logger.debug("Adding providers for multiconfig dependency %s" % l[3]) | 756 | taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) |
| 757 | taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) | 757 | seen.add(k) |
| 758 | seen.add(k) | 758 | new = True |
| 759 | new = True | ||
| 760 | 759 | ||
| 761 | for mc in self.multiconfigs: | 760 | for mc in self.multiconfigs: |
| 762 | taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) | 761 | taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) |
