From: Paul Eggleton Date: Fri, 19 Dec 2014 10:20:32 +0000 (+0000) Subject: cooker: add ability to ignore unmatched regexes in BBFILE_PATTERN X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19c74aaa2836a88d666f0032452fac521689ab6b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cooker: add ability to ignore unmatched regexes in BBFILE_PATTERN Add a BBFILE_PATTERN_IGNORE_EMPTY variable to allow ignoring the fact that a regex specified in BBFILE_PATTERN for a particular collection doesn't match any recipes. This will be used in OpenEmbedded in the workspace layers created by "devtool" which may not always contain any recipes (which is not cause for warning the user). Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 16fd4ad34c2..0d9b85e604a 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1385,7 +1385,7 @@ class BBCooker: raise bb.BBHandledException() self.show_appends_with_no_recipes() self.handlePrefProviders() - self.recipecache.bbfile_priority = self.collection.collection_priorities(self.recipecache.pkg_fn) + self.recipecache.bbfile_priority = self.collection.collection_priorities(self.recipecache.pkg_fn, self.data) self.state = state.running return None @@ -1610,7 +1610,7 @@ class CookerCollectFiles(object): filelist.append(filename) return filelist - def collection_priorities(self, pkgfns): + def collection_priorities(self, pkgfns, d): priorities = {} @@ -1639,7 +1639,8 @@ class CookerCollectFiles(object): for collection, pattern, regex, _ in self.bbfile_config_priorities: if regex in unmatched: - collectlog.warn("No bb files matched BBFILE_PATTERN_%s '%s'" % (collection, pattern)) + if d.getVar('BBFILE_PATTERN_IGNORE_EMPTY_%s' % collection, True) != '1': + collectlog.warn("No bb files matched BBFILE_PATTERN_%s '%s'" % (collection, pattern)) return priorities