Skip to contentSkip to conversation

lib/bb/cooker.py: fix for BBFILE_PATTERN = ""

PATCH New Robert Yang 1 participant 2 messages Oct 27, 2016

lore
Share & tools
lore
#0 lore raw

cover lib/bb/cooker.py: fix for BBFILE_PATTERN = ""

The following changes since commit e5815d0b607ff262663864d51fe51fbb37172329:

build-appliance-image: Update to master head revision (2016-10-26 09:33:57 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib rbt/bbfile
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/bbfile

Robert Yang (1):
lib/bb/cooker.py: fix for BBFILE_PATTERN = ""

 bitbake/lib/bb/cooker.py | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/1 lib/bb/cooker.py: fix for BBFILE_PATTERN = ""

There would be error when BBFILE_PATTERN = None:
BBFILE_PATTERN_foo not defined

This is the correct behaviour, but when the layer sets BBFILE_PATTERN = "", it would match all the remaining recipes, and cause "No bb files matched BBFILE_PATTERN" warnings for all the layers which behind it.

When a layer sets BBFILE_PATTERN = "" (for example, a layer only provides git repos and source tarballs), now it means has no recipes. This is different from BBFILE_PATTERN_IGNORE_EMPTY, the later one means that it *may* not have any recipes.

---
 bitbake/lib/bb/cooker.py | 4 ++++
 1 file changed, 4 insertions(+)
bitbake/lib/bb/cooker.py +4 -0
index 42831e2..c08af45 100644
@@ -1240,6 +1240,10 @@ class BBCooker:
                     parselog.error("BBFILE_PATTERN_%s not defined" % c)
                     errors = True
                     continue
+                elif regex == "":
+                    parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
+                    errors = False
+                    continue
                 try:
                     cre = re.compile(regex)
                 except re.error:
Signature · 1 line
2.9.0