diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-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): | |||
1519 | class CookerCollectFiles(object): | 1519 | class CookerCollectFiles(object): |
1520 | def __init__(self, priorities): | 1520 | def __init__(self, priorities): |
1521 | self.appendlist = {} | 1521 | self.appendlist = {} |
1522 | self.bbappends = [] | ||
1522 | self.appliedappendlist = [] | 1523 | self.appliedappendlist = [] |
1523 | self.bbfile_config_priorities = priorities | 1524 | self.bbfile_config_priorities = priorities |
1524 | 1525 | ||
@@ -1613,6 +1614,7 @@ class CookerCollectFiles(object): | |||
1613 | # Build a list of .bbappend files for each .bb file | 1614 | # Build a list of .bbappend files for each .bb file |
1614 | for f in bbappend: | 1615 | for f in bbappend: |
1615 | base = os.path.basename(f).replace('.bbappend', '.bb') | 1616 | base = os.path.basename(f).replace('.bbappend', '.bb') |
1617 | self.bbappends.append((base, f)) | ||
1616 | if not base in self.appendlist: | 1618 | if not base in self.appendlist: |
1617 | self.appendlist[base] = [] | 1619 | self.appendlist[base] = [] |
1618 | if f not in self.appendlist[base]: | 1620 | if f not in self.appendlist[base]: |
@@ -1638,11 +1640,11 @@ class CookerCollectFiles(object): | |||
1638 | """ | 1640 | """ |
1639 | filelist = [] | 1641 | filelist = [] |
1640 | f = os.path.basename(fn) | 1642 | f = os.path.basename(fn) |
1641 | for bbappend in self.appendlist: | 1643 | for b in self.bbappends: |
1644 | (bbappend, filename) = b | ||
1642 | if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): | 1645 | if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): |
1643 | self.appliedappendlist.append(bbappend) | 1646 | self.appliedappendlist.append(bbappend) |
1644 | for filename in self.appendlist[bbappend]: | 1647 | filelist.append(filename) |
1645 | filelist.append(filename) | ||
1646 | return filelist | 1648 | return filelist |
1647 | 1649 | ||
1648 | def collection_priorities(self, pkgfns): | 1650 | def collection_priorities(self, pkgfns): |
@@ -1662,10 +1664,10 @@ class CookerCollectFiles(object): | |||
1662 | unmatched.add(regex) | 1664 | unmatched.add(regex) |
1663 | 1665 | ||
1664 | def findmatch(regex): | 1666 | def findmatch(regex): |
1665 | for bbfile in self.appendlist: | 1667 | for b in self.bbappends: |
1666 | for append in self.appendlist[bbfile]: | 1668 | (bbfile, append) = b |
1667 | if regex.match(append): | 1669 | if regex.match(append): |
1668 | return True | 1670 | return True |
1669 | return False | 1671 | return False |
1670 | 1672 | ||
1671 | for unmatch in unmatched.copy(): | 1673 | for unmatch in unmatched.copy(): |