summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-02 10:09:43 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 16:51:07 +0100
commitb5bef4ea31ee09f053e519e76d20cad1e2ccba18 (patch)
treea80815f6ec9dd7945797fff9a04c5cb5d3da1d5a /bitbake
parent372f72f2ee5f6d7126d3dc22bd3940e5eccea351 (diff)
downloadpoky-b5bef4ea31ee09f053e519e76d20cad1e2ccba18.tar.gz
bitbake: cooker.py: Fix layer priority processing
If you have a layer with a blank BBFILE_PATTERN the layer was ignored when processing the list of layers with priorities. This list is not only used for processing recipes, but also by additional programs such as bitbake-layers show-layers. Without this change, a layer that provides configuration or classes only does now show up in show-layers, which is used by the yocto-compat-layer.py script. This causes a failures in the compatibility check. (Bitbake rev: 1db8336cee8cd22aaaa67e3dde5b9218840ba4a1) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index d254bd2797..7521ae878c 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1293,13 +1293,13 @@ class BBCooker:
1293 elif regex == "": 1293 elif regex == "":
1294 parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c) 1294 parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
1295 errors = False 1295 errors = False
1296 continue 1296 else:
1297 try: 1297 try:
1298 cre = re.compile(regex) 1298 cre = re.compile(regex)
1299 except re.error: 1299 except re.error:
1300 parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex) 1300 parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex)
1301 errors = True 1301 errors = True
1302 continue 1302 continue
1303 self.bbfile_config_priorities.append((c, regex, cre, collection_priorities[c])) 1303 self.bbfile_config_priorities.append((c, regex, cre, collection_priorities[c]))
1304 if errors: 1304 if errors:
1305 # We've already printed the actual error(s) 1305 # We've already printed the actual error(s)