bitbake-layers: handle skipped recipes
Report bbappends correctly for skipped recipes instead of reporting the bbappends as not having any matching recipe. (From Poky rev: 39d72ecf6bc1da85aefb11e6481719185f0cb953) (Bitbake rev: a71183762e5d7d9f8153832efb9595e3a21d62f1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
81e2f52fb8
commit
dc15ddd161
|
@ -83,6 +83,8 @@ class Commands(cmd.Cmd):
|
||||||
for pn in self.cooker_data.pkg_pn:
|
for pn in self.cooker_data.pkg_pn:
|
||||||
self.show_appends_for_pn(pn)
|
self.show_appends_for_pn(pn)
|
||||||
|
|
||||||
|
self.show_appends_for_skipped()
|
||||||
|
|
||||||
self.show_appends_with_no_recipes()
|
self.show_appends_with_no_recipes()
|
||||||
|
|
||||||
def show_appends_for_pn(self, pn):
|
def show_appends_for_pn(self, pn):
|
||||||
|
@ -94,17 +96,27 @@ class Commands(cmd.Cmd):
|
||||||
self.cooker_data.pkg_pn)
|
self.cooker_data.pkg_pn)
|
||||||
best_filename = os.path.basename(best[3])
|
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)
|
appended, missing = self.get_appends_for_files(filenames)
|
||||||
if appended:
|
if appended:
|
||||||
for basename, appends in appended:
|
for basename, appends in appended:
|
||||||
logger.info('%s:', basename)
|
logger.info('%s%s:', basename, name_suffix)
|
||||||
for append in appends:
|
for append in appends:
|
||||||
logger.info(' %s', append)
|
logger.info(' %s', append)
|
||||||
|
|
||||||
if best_filename in missing:
|
if best_filename:
|
||||||
logger.warn('%s: missing append for preferred version',
|
if best_filename in missing:
|
||||||
best_filename)
|
logger.warn('%s: missing append for preferred version',
|
||||||
self.returncode |= 1
|
best_filename)
|
||||||
|
self.returncode |= 1
|
||||||
|
|
||||||
|
|
||||||
def get_appends_for_files(self, filenames):
|
def get_appends_for_files(self, filenames):
|
||||||
appended, notappended = set(), set()
|
appended, notappended = set(), set()
|
||||||
|
@ -124,6 +136,8 @@ class Commands(cmd.Cmd):
|
||||||
def show_appends_with_no_recipes(self):
|
def show_appends_with_no_recipes(self):
|
||||||
recipes = set(os.path.basename(f)
|
recipes = set(os.path.basename(f)
|
||||||
for f in self.cooker_data.pkg_fn.iterkeys())
|
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()
|
appended_recipes = self.cooker_data.appends.iterkeys()
|
||||||
appends_without_recipes = [self.cooker_data.appends[recipe]
|
appends_without_recipes = [self.cooker_data.appends[recipe]
|
||||||
for recipe in appended_recipes
|
for recipe in appended_recipes
|
||||||
|
|
Loading…
Reference in New Issue