diff options
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 0ea974d4ff..5e2ebd7969 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -164,6 +164,9 @@ python copy_buildsystem () { f.write(' $' + '{SDKBASEMETAPATH}/workspace \\\n') f.write(' "\n') + env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE', True) or '').split() + env_whitelist_values = {} + # Create local.conf builddir = d.getVar('TOPDIR', True) if derivative: @@ -176,6 +179,8 @@ python copy_buildsystem () { newlines.append('# Removed original setting of %s\n' % varname) return None, op, 0, True else: + if varname in env_whitelist: + env_whitelist_values[varname] = origvalue return origvalue, op, 0, True varlist = ['[^#=+ ]*'] with open(builddir + '/conf/local.conf', 'r') as f: @@ -241,6 +246,21 @@ python copy_buildsystem () { if line.strip() and not line.startswith('#'): f.write(line) + # Ensure any variables set from the external environment (by way of + # BB_ENV_EXTRAWHITE) are set in the SDK's configuration + extralines = [] + for name, value in env_whitelist_values.iteritems(): + actualvalue = d.getVar(name, True) or '' + if value != actualvalue: + extralines.append('%s = "%s"\n' % (name, actualvalue)) + if extralines: + with open(baseoutpath + '/conf/local.conf', 'a') as f: + f.write('\n') + f.write('# Extra settings from environment:\n') + for line in extralines: + f.write(line) + f.write('\n') + # Filter the locked signatures file to just the sstate tasks we are interested in excluded_targets = d.getVar('SDK_TARGETS', True) sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' |