diff options
| -rwxr-xr-x | bin/bitbake-layers | 21 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 22 |
2 files changed, 23 insertions, 20 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers index dfbdb7032..5abf26cfb 100755 --- a/bin/bitbake-layers +++ b/bin/bitbake-layers @@ -55,7 +55,7 @@ class Commands(cmd.Cmd): def prepare_cooker(self): sys.stderr.write("Parsing recipes..") - logger.setLevel(logging.ERROR) + logger.setLevel(logging.WARNING) try: while self.cooker.state in (state.initial, state.parsing): @@ -156,8 +156,6 @@ class Commands(cmd.Cmd): self.show_appends_for_skipped() - self.show_appends_with_no_recipes() - def show_appends_for_pn(self, pn): filenames = self.cooker_data.pkg_pn[pn] @@ -204,23 +202,6 @@ class Commands(cmd.Cmd): notappended.append(basename) return appended, notappended - def show_appends_with_no_recipes(self): - recipes = set(os.path.basename(f) - for f in self.cooker_data.pkg_fn.iterkeys()) - recipes |= set(os.path.basename(f) - for f in self.cooker.skiplist.iterkeys()) - appended_recipes = self.cooker_data.appends.iterkeys() - appends_without_recipes = [self.cooker_data.appends[recipe] - for recipe in appended_recipes - if recipe not in recipes] - if appends_without_recipes: - appendlines = (' %s' % append - for appends in appends_without_recipes - for append in appends) - logger.warn('No recipes available for:\n%s', - '\n'.join(appendlines)) - self.returncode |= 4 - def do_EOF(self, line): return True diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 83fd07ba0..c35ea372c 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -480,6 +480,27 @@ class BBCooker: return pri return 0 + def show_appends_with_no_recipes( self ): + recipes = set(os.path.basename(f) + for f in self.status.pkg_fn.iterkeys()) + recipes |= set(os.path.basename(f) + for f in self.skiplist.iterkeys()) + appended_recipes = self.appendlist.iterkeys() + appends_without_recipes = [self.appendlist[recipe] + for recipe in appended_recipes + if recipe not in recipes] + if appends_without_recipes: + appendlines = (' %s' % append + for appends in appends_without_recipes + for append in appends) + msg = 'No recipes available for:\n%s' % '\n'.join(appendlines) + warn_only = data.getVar("BB_DANGLINGAPPENDS_WARNONLY", \ + self.configuration.data, False) or "no" + if warn_only.lower() in ("1", "yes", "true"): + bb.warn(msg) + else: + bb.fatal(msg) + def buildDepgraph( self ): all_depends = self.status.all_depends pn_provides = self.status.pn_provides @@ -1005,6 +1026,7 @@ class BBCooker: if not self.parser.parse_next(): collectlog.debug(1, "parsing complete") + self.show_appends_with_no_recipes() self.buildDepgraph() self.state = state.running return None |