diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-24 11:12:50 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 11:24:01 +0100 |
| commit | 72accaf7d909bea14412fee06004b6b8acbe5b80 (patch) | |
| tree | f8c6f66f540a0bd3163db803d21a8e4d99132701 /bitbake/bin/bitbake-layers | |
| parent | fa4b1fa2577fb1a8128154c2f1417df575dbb022 (diff) | |
| download | openembedded-core-contrib-72accaf7d909bea14412fee06004b6b8acbe5b80.tar.gz | |
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>
Diffstat (limited to 'bitbake/bin/bitbake-layers')
| -rwxr-xr-x | bitbake/bin/bitbake-layers | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 86a17a55ea..ae61239da6 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -371,8 +371,8 @@ build results (as the layer priority order has effectively changed). appended_recipes = [] for layer in layers: overlayed = [] - for f in self.bbhandler.cooker.overlayed.iterkeys(): - for of in self.bbhandler.cooker.overlayed[f]: + for f in self.bbhandler.cooker.collection.overlayed.iterkeys(): + for of in self.bbhandler.cooker.collection.overlayed[f]: if of.startswith(layer): overlayed.append(of) @@ -396,8 +396,8 @@ build results (as the layer priority order has effectively changed). logger.warn('Overwriting file %s', fdest) bb.utils.copyfile(f1full, fdest) if ext == '.bb': - if f1 in self.bbhandler.cooker.appendlist: - appends = self.bbhandler.cooker.appendlist[f1] + if f1 in self.bbhandler.cooker.collection.appendlist: + appends = self.bbhandler.cooker.collection.appendlist[f1] if appends: logger.plain(' Applying appends to %s' % fdest ) for appendname in appends: @@ -406,9 +406,9 @@ build results (as the layer priority order has effectively changed). appended_recipes.append(f1) # 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: - appends = self.bbhandler.cooker.appendlist[recipename] + appends = self.bbhandler.cooker.collection.appendlist[recipename] first_append = None for appendname in appends: layer = layer_path_match(appendname) @@ -498,7 +498,7 @@ usage: show-appends Recipes are listed with the bbappends that apply to them as subitems. """ self.bbhandler.prepare() - if not self.bbhandler.cooker.appendlist: + if not self.bbhandler.cooker.collection.appendlist: logger.plain('No append files found') return @@ -550,7 +550,7 @@ Recipes are listed with the bbappends that apply to them as subitems. continue basename = os.path.basename(filename) - appends = self.bbhandler.cooker.appendlist.get(basename) + appends = self.bbhandler.cooker.collection.appendlist.get(basename) if appends: appended.append((basename, list(appends))) else: |