diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 16fd4ad34c..0d9b85e604 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1385,7 +1385,7 @@ class BBCooker: | |||
1385 | raise bb.BBHandledException() | 1385 | raise bb.BBHandledException() |
1386 | self.show_appends_with_no_recipes() | 1386 | self.show_appends_with_no_recipes() |
1387 | self.handlePrefProviders() | 1387 | self.handlePrefProviders() |
1388 | self.recipecache.bbfile_priority = self.collection.collection_priorities(self.recipecache.pkg_fn) | 1388 | self.recipecache.bbfile_priority = self.collection.collection_priorities(self.recipecache.pkg_fn, self.data) |
1389 | self.state = state.running | 1389 | self.state = state.running |
1390 | return None | 1390 | return None |
1391 | 1391 | ||
@@ -1610,7 +1610,7 @@ class CookerCollectFiles(object): | |||
1610 | filelist.append(filename) | 1610 | filelist.append(filename) |
1611 | return filelist | 1611 | return filelist |
1612 | 1612 | ||
1613 | def collection_priorities(self, pkgfns): | 1613 | def collection_priorities(self, pkgfns, d): |
1614 | 1614 | ||
1615 | priorities = {} | 1615 | priorities = {} |
1616 | 1616 | ||
@@ -1639,7 +1639,8 @@ class CookerCollectFiles(object): | |||
1639 | 1639 | ||
1640 | for collection, pattern, regex, _ in self.bbfile_config_priorities: | 1640 | for collection, pattern, regex, _ in self.bbfile_config_priorities: |
1641 | if regex in unmatched: | 1641 | if regex in unmatched: |
1642 | collectlog.warn("No bb files matched BBFILE_PATTERN_%s '%s'" % (collection, pattern)) | 1642 | if d.getVar('BBFILE_PATTERN_IGNORE_EMPTY_%s' % collection, True) != '1': |
1643 | collectlog.warn("No bb files matched BBFILE_PATTERN_%s '%s'" % (collection, pattern)) | ||
1643 | 1644 | ||
1644 | return priorities | 1645 | return priorities |
1645 | 1646 | ||