diff options
| author | Randy Witt <randy.e.witt@linux.intel.com> | 2016-02-29 14:22:36 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-02 22:39:07 +0000 |
| commit | 914b0a99997d8c69eafcb34dd982f46540eed882 (patch) | |
| tree | 1a8ca3f4668b556e4fee05a54bbfc58f32bd95c9 /meta/classes | |
| parent | bee0f633f0b5ef2439b8e5d54cbfc7bc1f17f47e (diff) | |
| download | openembedded-core-914b0a99997d8c69eafcb34dd982f46540eed882.tar.gz openembedded-core-914b0a99997d8c69eafcb34dd982f46540eed882.tar.bz2 openembedded-core-914b0a99997d8c69eafcb34dd982f46540eed882.zip | |
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 <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
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') |