bitbake: Fix handling of empty variables in local config files

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7fbfb5beb5e24acff78b8f7256e04e1f8dbf396b..488bc610d27745e98c20df010864cf1d5e13eb60 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -550,7 +550,7 @@ class BBCooker:
                     for key in data.dict:
                         if key != "_data":
                             value = data.getVar(key, False)
-                            if "${LAYERDIR}" in value:
+                            if value and "${LAYERDIR}" in value:
                                 data.setVar(key, value.replace("${LAYERDIR}", layer))
 
                 bb.data.delVar('LAYERDIR', data)