sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: bitbake-layers: fix show-appends and flatten for recent cooker changes 

Fixes the show-appends and flatten subcommands for recent refactoring in
cooker.

[YOCTO #4536]
[YOCTO #4535]

(Bitbake rev: 54817d0de667941ee68fe3490684159e2d90e9c5)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2013-05-24 11:12:50 +01:00 committed by Richard Purdie
parent fa4b1fa257
commit 72accaf7d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bitbake/bin/bitbake-layers
View File

@ -371,8 +371,8 @@ build results (as the layer priority order has effectively changed).
appended_recipes = [] appended_recipes = []
for layer in layers: for layer in layers:
overlayed = [] overlayed = []
for f in self.bbhandler.cooker.overlayed.iterkeys(): for f in self.bbhandler.cooker.collection.overlayed.iterkeys():
for of in self.bbhandler.cooker.overlayed[f]: for of in self.bbhandler.cooker.collection.overlayed[f]:
if of.startswith(layer): if of.startswith(layer):
overlayed.append(of) overlayed.append(of)
@ -396,8 +396,8 @@ build results (as the layer priority order has effectively changed).
logger.warn('Overwriting file %s', fdest) logger.warn('Overwriting file %s', fdest)
bb.utils.copyfile(f1full, fdest) bb.utils.copyfile(f1full, fdest)
if ext == '.bb': if ext == '.bb':
if f1 in self.bbhandler.cooker.appendlist: if f1 in self.bbhandler.cooker.collection.appendlist:
appends = self.bbhandler.cooker.appendlist[f1] appends = self.bbhandler.cooker.collection.appendlist[f1]
if appends: if appends:
logger.plain(' Applying appends to %s' % fdest ) logger.plain(' Applying appends to %s' % fdest )
for appendname in appends: for appendname in appends:
@ -406,9 +406,9 @@ build results (as the layer priority order has effectively changed).
appended_recipes.append(f1) appended_recipes.append(f1)
# Take care of when some layers are excluded and yet we have included bbappends for those recipes # Take care of when some layers are excluded and yet we have included bbappends for those recipes
for recipename in self.bbhandler.cooker.appendlist.iterkeys(): for recipename in self.bbhandler.cooker.collection.appendlist.iterkeys():
if recipename not in appended_recipes: if recipename not in appended_recipes:
appends = self.bbhandler.cooker.appendlist[recipename] appends = self.bbhandler.cooker.collection.appendlist[recipename]
first_append = None first_append = None
for appendname in appends: for appendname in appends:
layer = layer_path_match(appendname) layer = layer_path_match(appendname)
@ -498,7 +498,7 @@ usage: show-appends
Recipes are listed with the bbappends that apply to them as subitems. Recipes are listed with the bbappends that apply to them as subitems.
""" """
self.bbhandler.prepare() self.bbhandler.prepare()
if not self.bbhandler.cooker.appendlist: if not self.bbhandler.cooker.collection.appendlist:
logger.plain('No append files found') logger.plain('No append files found')
return return
@ -550,7 +550,7 @@ Recipes are listed with the bbappends that apply to them as subitems.
continue continue
basename = os.path.basename(filename) basename = os.path.basename(filename)
appends = self.bbhandler.cooker.appendlist.get(basename) appends = self.bbhandler.cooker.collection.appendlist.get(basename)
if appends: if appends:
appended.append((basename, list(appends))) appended.append((basename, list(appends)))
else: else: