summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-02-29 14:22:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:45 +0000
commiteac4061839873f87be9c37489ade5b7823228c6b (patch)
treefad1861221f19f355b055c4b12349ef727e4b4a7 /meta/classes/populate_sdk_ext.bbclass
parentc366343724ee5091ce2f06c2d230288a678015f7 (diff)
downloadpoky-eac4061839873f87be9c37489ade5b7823228c6b.tar.gz
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. (From OE-Core rev: 914b0a99997d8c69eafcb34dd982f46540eed882) 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/populate_sdk_ext.bbclass')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass7
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 () {
143 f.write('# this configuration provides, it is strongly suggested that you set\n') 143 f.write('# this configuration provides, it is strongly suggested that you set\n')
144 f.write('# up a proper instance of the full build system and use that instead.\n\n') 144 f.write('# up a proper instance of the full build system and use that instead.\n\n')
145 145
146 f.write('LCONF_VERSION = "%s"\n\n' % d.getVar('LCONF_VERSION', False)) 146 # LCONF_VERSION may not be set, for example when using meta-poky
147 # so don't error if it isn't found
148 lconf_version = d.getVar('LCONF_VERSION', False)
149 if lconf_version is not None:
150 f.write('LCONF_VERSION = "%s"\n\n' % lconf_version)
151
147 f.write('BBPATH = "$' + '{TOPDIR}"\n') 152 f.write('BBPATH = "$' + '{TOPDIR}"\n')
148 f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n') 153 f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n')
149 f.write('BBLAYERS := " \\\n') 154 f.write('BBLAYERS := " \\\n')