diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 455af320e8..dcc4104262 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -309,7 +309,7 @@ class Parameters: | |||
309 | 309 | ||
310 | def hob_conf_filter(fn, data): | 310 | def hob_conf_filter(fn, data): |
311 | if fn.endswith("/local.conf"): | 311 | if fn.endswith("/local.conf"): |
312 | distro = data.getVar("DISTRO_HOB") | 312 | distro = data.getVar("DISTRO_HOB", False) |
313 | if distro: | 313 | if distro: |
314 | if distro != "defaultsetup": | 314 | if distro != "defaultsetup": |
315 | data.setVar("DISTRO", distro) | 315 | data.setVar("DISTRO", distro) |
@@ -320,13 +320,13 @@ def hob_conf_filter(fn, data): | |||
320 | "BB_NUMBER_THREADS_HOB", "PARALLEL_MAKE_HOB", "DL_DIR_HOB", \ | 320 | "BB_NUMBER_THREADS_HOB", "PARALLEL_MAKE_HOB", "DL_DIR_HOB", \ |
321 | "SSTATE_DIR_HOB", "SSTATE_MIRRORS_HOB", "INCOMPATIBLE_LICENSE_HOB"] | 321 | "SSTATE_DIR_HOB", "SSTATE_MIRRORS_HOB", "INCOMPATIBLE_LICENSE_HOB"] |
322 | for key in keys: | 322 | for key in keys: |
323 | var_hob = data.getVar(key) | 323 | var_hob = data.getVar(key, False) |
324 | if var_hob: | 324 | if var_hob: |
325 | data.setVar(key.split("_HOB")[0], var_hob) | 325 | data.setVar(key.split("_HOB")[0], var_hob) |
326 | return | 326 | return |
327 | 327 | ||
328 | if fn.endswith("/bblayers.conf"): | 328 | if fn.endswith("/bblayers.conf"): |
329 | layers = data.getVar("BBLAYERS_HOB") | 329 | layers = data.getVar("BBLAYERS_HOB", False) |
330 | if layers: | 330 | if layers: |
331 | data.setVar("BBLAYERS", layers) | 331 | data.setVar("BBLAYERS", layers) |
332 | return | 332 | return |