diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 70cccefe0c..8bbe1e9fde 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1519,6 +1519,7 @@ class CookerExit(bb.event.Event): class CookerCollectFiles(object): def __init__(self, priorities): self.appendlist = {} + self.bbappends = [] self.appliedappendlist = [] self.bbfile_config_priorities = priorities @@ -1613,6 +1614,7 @@ class CookerCollectFiles(object): # Build a list of .bbappend files for each .bb file for f in bbappend: base = os.path.basename(f).replace('.bbappend', '.bb') + self.bbappends.append((base, f)) if not base in self.appendlist: self.appendlist[base] = [] if f not in self.appendlist[base]: @@ -1638,11 +1640,11 @@ class CookerCollectFiles(object): """ filelist = [] f = os.path.basename(fn) - for bbappend in self.appendlist: + for b in self.bbappends: + (bbappend, filename) = b if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): self.appliedappendlist.append(bbappend) - for filename in self.appendlist[bbappend]: - filelist.append(filename) + filelist.append(filename) return filelist def collection_priorities(self, pkgfns): @@ -1662,10 +1664,10 @@ class CookerCollectFiles(object): unmatched.add(regex) def findmatch(regex): - for bbfile in self.appendlist: - for append in self.appendlist[bbfile]: - if regex.match(append): - return True + for b in self.bbappends: + (bbfile, append) = b + if regex.match(append): + return True return False for unmatch in unmatched.copy(): |