diff options
-rw-r--r-- | meta/classes-recipe/populate_sdk_ext.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 20dfdf02d4..36a3e9c836 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass | |||
@@ -345,7 +345,13 @@ def write_local_conf(d, baseoutpath, derivative, core_meta_subdir, uninative_che | |||
345 | if bb.data.inherits_class('uninative', d): | 345 | if bb.data.inherits_class('uninative', d): |
346 | f.write('INHERIT += "%s"\n' % 'uninative') | 346 | f.write('INHERIT += "%s"\n' % 'uninative') |
347 | f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum)) | 347 | f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum)) |
348 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) | 348 | |
349 | # CONF_VERSION may not be set, for example when using an empty local.conf | ||
350 | # generated with bitbake-setup, and it is not otherwise required to exist. | ||
351 | # Write it out only if it's defined. | ||
352 | conf_version = d.getVar('CONF_VERSION', False) | ||
353 | if conf_version is not None: | ||
354 | f.write('CONF_VERSION = "%s"\n\n' % conf_version) | ||
349 | 355 | ||
350 | # Some classes are not suitable for SDK, remove them from INHERIT | 356 | # Some classes are not suitable for SDK, remove them from INHERIT |
351 | f.write('INHERIT:remove = "%s"\n' % d.getVar('ESDK_CLASS_INHERIT_DISABLE', False)) | 357 | f.write('INHERIT:remove = "%s"\n' % d.getVar('ESDK_CLASS_INHERIT_DISABLE', False)) |