diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f0dab97974..f991c8f123 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1808,21 +1808,25 @@ class CookerCollectFiles(object): | |||
1808 | realfn, cls, mc = bb.cache.virtualfn2realfn(p) | 1808 | realfn, cls, mc = bb.cache.virtualfn2realfn(p) |
1809 | priorities[p] = self.calc_bbfile_priority(realfn, matched) | 1809 | priorities[p] = self.calc_bbfile_priority(realfn, matched) |
1810 | 1810 | ||
1811 | # Don't show the warning if the BBFILE_PATTERN did match .bbappend files | ||
1812 | unmatched = set() | 1811 | unmatched = set() |
1813 | for _, _, regex, pri in self.bbfile_config_priorities: | 1812 | for _, _, regex, pri in self.bbfile_config_priorities: |
1814 | if not regex in matched: | 1813 | if not regex in matched: |
1815 | unmatched.add(regex) | 1814 | unmatched.add(regex) |
1816 | 1815 | ||
1817 | def findmatch(regex): | 1816 | # Don't show the warning if the BBFILE_PATTERN did match .bbappend files |
1817 | def find_bbappend_match(regex): | ||
1818 | for b in self.bbappends: | 1818 | for b in self.bbappends: |
1819 | (bbfile, append) = b | 1819 | (bbfile, append) = b |
1820 | if regex.match(append): | 1820 | if regex.match(append): |
1821 | # If the bbappend is matched by already "matched set", return False | ||
1822 | for matched_regex in matched: | ||
1823 | if matched_regex.match(append): | ||
1824 | return False | ||
1821 | return True | 1825 | return True |
1822 | return False | 1826 | return False |
1823 | 1827 | ||
1824 | for unmatch in unmatched.copy(): | 1828 | for unmatch in unmatched.copy(): |
1825 | if findmatch(unmatch): | 1829 | if find_bbappend_match(unmatch): |
1826 | unmatched.remove(unmatch) | 1830 | unmatched.remove(unmatch) |
1827 | 1831 | ||
1828 | for collection, pattern, regex, _ in self.bbfile_config_priorities: | 1832 | for collection, pattern, regex, _ in self.bbfile_config_priorities: |