[bitbake-devel] [RFC PATCH 2/2] bitbake-layers: handle skipped recipes
Joshua Lock
josh at linux.intel.com
Thu Jun 2 20:03:45 UTC 2011
On Wed, 2011-06-01 at 18:26 +0100, Paul Eggleton wrote:
> Report bbappends correctly for skipped recipes instead of reporting the
> bbappends as not having any matching recipe.
>
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Cool! I know this depends on the 1st patch but
Signed-off-by: Joshua Lock <josh at linux.intel.com>
> ---
> bitbake/bin/bitbake-layers | 24 +++++++++++++++++++-----
> 1 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
> index b6106cd..c58aee3 100755
> --- a/bitbake/bin/bitbake-layers
> +++ b/bitbake/bin/bitbake-layers
> @@ -81,6 +81,8 @@ class Commands(cmd.Cmd):
> for pn in self.cooker_data.pkg_pn:
> self.show_appends_for_pn(pn)
>
> + self.show_appends_for_skipped()
> +
> self.show_appends_with_no_recipes()
>
> def show_appends_for_pn(self, pn):
> @@ -92,17 +94,27 @@ class Commands(cmd.Cmd):
> self.cooker_data.pkg_pn)
> best_filename = os.path.basename(best[3])
>
> + self.show_appends_output(filenames, best_filename)
> +
> + def show_appends_for_skipped(self):
> + filenames = [os.path.basename(f)
> + for f in self.cooker.skiplist.iterkeys()]
> + 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)
> if appended:
> for basename, appends in appended:
> - logger.info('%s:', basename)
> + logger.info('%s%s:', basename, name_suffix)
> for append in appends:
> logger.info(' %s', append)
>
> - if best_filename in missing:
> - logger.warn('%s: missing append for preferred version',
> - best_filename)
> - self.returncode |= 1
> + if best_filename:
> + if best_filename in missing:
> + logger.warn('%s: missing append for preferred version',
> + best_filename)
> + self.returncode |= 1
> +
>
> def get_appends_for_files(self, filenames):
> appended, notappended = set(), set()
> @@ -122,6 +134,8 @@ class Commands(cmd.Cmd):
> 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
--
Joshua Lock
Yocto Build System Monkey
Intel Open Source Technology Centre
More information about the bitbake-devel
mailing list