summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-17 12:12:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-18 12:12:07 +0100
commit60a253555a3ebadea775cfdc3331cba78ee3e71b (patch)
tree94aea5a67e5c54ed678538645634ca288f3c391f /bin
parent0448714c52bc1e9584a5282cffdcaa404fb0618a (diff)
downloadbitbake-60a253555a3ebadea775cfdc3331cba78ee3e71b.zip
bitbake-layers: refactor show-appends to stop using cooker bbappends list
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bitbake-layers21
1 files changed, 13 insertions, 8 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers
index 62b51b05..8cf7196c 100755
--- a/bin/bitbake-layers
+++ b/bin/bitbake-layers
@@ -719,18 +719,21 @@ build results (as the layer priority order has effectively changed).
Lists recipes with the bbappends that apply to them as subitems.
"""
self.init_bbhandler()
- if not self.bbhandler.cooker.collection.bbappends:
- logger.plain('No append files found')
- return 0
logger.plain('=== Appended recipes ===')
pnlist = list(self.bbhandler.cooker_data.pkg_pn.keys())
pnlist.sort()
+ appends = False
for pn in pnlist:
- self.show_appends_for_pn(pn)
+ if self.show_appends_for_pn(pn):
+ appends = True
+
+ if self.show_appends_for_skipped():
+ appends = True
- self.show_appends_for_skipped()
+ if not appends:
+ logger.plain('No append files found')
def show_appends_for_pn(self, pn):
filenames = self.bbhandler.cooker_data.pkg_pn[pn]
@@ -741,12 +744,12 @@ Lists recipes with the bbappends that apply to them as subitems.
self.bbhandler.cooker_data.pkg_pn)
best_filename = os.path.basename(best[3])
- self.show_appends_output(filenames, best_filename)
+ return self.show_appends_output(filenames, best_filename)
def show_appends_for_skipped(self):
filenames = [os.path.basename(f)
for f in self.bbhandler.cooker.skiplist.iterkeys()]
- self.show_appends_output(filenames, None, " (skipped)")
+ return self.show_appends_output(filenames, None, " (skipped)")
def show_appends_output(self, filenames, best_filename, name_suffix = ''):
appended, missing = self.get_appends_for_files(filenames)
@@ -760,7 +763,9 @@ Lists recipes with the bbappends that apply to them as subitems.
if best_filename in missing:
logger.warn('%s: missing append for preferred version',
best_filename)
-
+ return True
+ else:
+ return False
def get_appends_for_files(self, filenames):
appended, notappended = [], []