[PATCH 0/1] cooker: Fix bbfile_config_priorities when BBFILE_PATTERN is empty

[PATCH 0/1] cooker: Fix bbfile_config_priorities when BBFILE_PATTERN is empty

[Robert Yang]

The following changes since commit 753e2a0ede4449917c75353b57f13bbafe70fac8:

  build-appliance-image: Update to master head revision (2019-03-19 23:56:29 +0000)

are available in the git repository at:

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

Robert Yang (1):
  cooker: Fix bbfile_config_priorities when BBFILE_PATTERN is empty

 bitbake/lib/bb/cooker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/1] cooker: Fix bbfile_config_priorities when BBFILE_PATTERN is empty

[Robert Yang]

The layer was not in bbfile_config_priorities when BBFILE_PATTERN is empty,
this caused "bitbake-layers show-layers" can't show these layers, this was
incorrect since these layer did exist. Add these layer to
bbfile_config_priorities can fix the problem.

Fixed:
Add BBFILE_PATTERN_core = "" in oe-core/meta/conf/layer.conf
$ bitbake show-layers | grep oe-core

There was nothing, now the layer is shown

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/cooker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1982e88..9ccaa79 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1216,8 +1216,8 @@ class BBCooker:
                     continue
                 elif regex == "":
                     parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
+                    cre = re.compile('^NULL$')
                     errors = False
-                    continue
                 else:
                     try:
                         cre = re.compile(regex)
-- 
2.7.4