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-05 15:00:49 +0100
commit2b2606003bf4a952cb4b0ab7163e34e836481a01 (patch)
tree38153c2a176be4dbbe7032eda64f531c29af0cb1 /bitbake
parentf16cab3e74712d0943d861949b9b439f97efdf1f (diff)
downloadpoky-2b2606003bf4a952cb4b0ab7163e34e836481a01.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: a0eaf8c0f228f984bafff09e4e9739f758dc1a9b) 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 f5ae831c4a..90de40d649 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1171,13 +1171,13 @@ class BBCooker:
1171 elif regex == "": 1171 elif regex == "":
1172 parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c) 1172 parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
1173 errors = False 1173 errors = False
1174 continue 1174 else:
1175 try: 1175 try:
1176 cre = re.compile(regex) 1176 cre = re.compile(regex)
1177 except re.error: 1177 except re.error:
1178 parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex) 1178 parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex)
1179 errors = True 1179 errors = True
1180 continue 1180 continue
1181 self.bbfile_config_priorities.append((c, regex, cre, collection_priorities[c])) 1181 self.bbfile_config_priorities.append((c, regex, cre, collection_priorities[c]))
1182 if errors: 1182 if errors:
1183 # We've already printed the actual error(s) 1183 # We've already printed the actual error(s)