summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-17 12:12:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:46 +0100
commitb84bf58c192e8b289f57fd6a22c0ae71bf893b2a (patch)
tree6c3c0f0a0d84d5eb66c9ccffb6ff0ef94af78e5f /bitbake/lib/bb
parente2ddc18874c8a8b52a22430b2909f37e936a4ccd (diff)
downloadpoky-b84bf58c192e8b289f57fd6a22c0ae71bf893b2a.tar.gz
bitbake: cooker: drop appliedappendlist
Whilst collecting this list on the fly may be quicker, doing so within a function that's meant to *query* the list of bbappends is poor practice. (Bitbake rev: 5c12aa3b0010d7d1733e54a0ca7d0af465454210) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py28
1 files changed, 18 insertions, 10 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a2b0bb5d7d..5452debefd 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -919,15 +919,25 @@ class BBCooker:
919 print("}", file=tdepends_file) 919 print("}", file=tdepends_file)
920 logger.info("Task dependencies saved to 'task-depends.dot'") 920 logger.info("Task dependencies saved to 'task-depends.dot'")
921 921
922 def show_appends_with_no_recipes( self ): 922 def show_appends_with_no_recipes(self):
923 appends_without_recipes = [self.collection.appendlist[recipe] 923 # Determine which bbappends haven't been applied
924 for recipe in self.collection.appendlist 924
925 if recipe not in self.collection.appliedappendlist] 925 # First get list of recipes, including skipped
926 recipefns = self.recipecache.pkg_fn.keys()
927 recipefns.extend(self.skiplist.keys())
928
929 # Work out list of bbappends that have been applied
930 applied_appends = []
931 for fn in recipefns:
932 applied_appends.extend(self.collection.get_file_appends(fn))
933
934 appends_without_recipes = []
935 for _, appendfn in self.collection.bbappends:
936 if not appendfn in applied_appends:
937 appends_without_recipes.append(appendfn)
938
926 if appends_without_recipes: 939 if appends_without_recipes:
927 appendlines = (' %s' % append 940 msg = 'No recipes available for:\n %s' % '\n '.join(appends_without_recipes)
928 for appends in appends_without_recipes
929 for append in appends)
930 msg = 'No recipes available for:\n%s' % '\n'.join(appendlines)
931 warn_only = self.data.getVar("BB_DANGLINGAPPENDS_WARNONLY", \ 941 warn_only = self.data.getVar("BB_DANGLINGAPPENDS_WARNONLY", \
932 False) or "no" 942 False) or "no"
933 if warn_only.lower() in ("1", "yes", "true"): 943 if warn_only.lower() in ("1", "yes", "true"):
@@ -1646,7 +1656,6 @@ class CookerCollectFiles(object):
1646 def __init__(self, priorities): 1656 def __init__(self, priorities):
1647 self.appendlist = {} 1657 self.appendlist = {}
1648 self.bbappends = [] 1658 self.bbappends = []
1649 self.appliedappendlist = []
1650 self.bbfile_config_priorities = priorities 1659 self.bbfile_config_priorities = priorities
1651 1660
1652 def calc_bbfile_priority( self, filename, matched = None ): 1661 def calc_bbfile_priority( self, filename, matched = None ):
@@ -1769,7 +1778,6 @@ class CookerCollectFiles(object):
1769 for b in self.bbappends: 1778 for b in self.bbappends:
1770 (bbappend, filename) = b 1779 (bbappend, filename) = b
1771 if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): 1780 if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])):
1772 self.appliedappendlist.append(bbappend)
1773 filelist.append(filename) 1781 filelist.append(filename)
1774 return filelist 1782 return filelist
1775 1783