From: Randy Witt Date: Mon, 29 Feb 2016 22:22:36 +0000 (-0800) Subject: populate_sdk_ext: Only write LCONF_VERSION to bblayers if it is set X-Git-Tag: 2016-4~605 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=914b0a99997d8c69eafcb34dd982f46540eed882;p=openembedded-core.git populate_sdk_ext: Only write LCONF_VERSION to bblayers if it is set It is possible that LCONF_VERSION won't be set, such as if meta-poky is used. Without this change, bblayers.conf would have LCONF_VERSION = "None" if LCONF_VERSION wasn't set, which would cause a sanity check failure. Signed-off-by: Randy Witt Signed-off-by: Richard Purdie --- diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 1f0621489f..6079166980 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -143,7 +143,12 @@ python copy_buildsystem () { f.write('# this configuration provides, it is strongly suggested that you set\n') f.write('# up a proper instance of the full build system and use that instead.\n\n') - f.write('LCONF_VERSION = "%s"\n\n' % d.getVar('LCONF_VERSION', False)) + # LCONF_VERSION may not be set, for example when using meta-poky + # so don't error if it isn't found + lconf_version = d.getVar('LCONF_VERSION', False) + if lconf_version is not None: + f.write('LCONF_VERSION = "%s"\n\n' % lconf_version) + f.write('BBPATH = "$' + '{TOPDIR}"\n') f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n') f.write('BBLAYERS := " \\\n')