diff options
author | Saul Wold <Saul.Wold@windriver.com> | 2022-03-09 09:40:52 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-10 08:00:28 +0000 |
commit | d9e500f83d0223925ca2595c77c8fb45eab10f7c (patch) | |
tree | 5b8fc1787ced86daebd7a7e26dd3bd69f9d5551b /meta/classes/populate_sdk_ext.bbclass | |
parent | 8827a3ed80ec8f0adcf4b778f88cb8f9f051262b (diff) | |
download | poky-d9e500f83d0223925ca2595c77c8fb45eab10f7c.tar.gz |
meta/scripts: Improve internal variable naming
Update internal variable names to improve the terms used.
(From OE-Core rev: f408068e5d7998ae165f3002e51bc54b380b8099)
Signed-off-by: Saul Wold <saul.wold@windriver.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.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9c9561c5c6..e2019f9bbf 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -282,8 +282,8 @@ python copy_buildsystem () { | |||
282 | bb.utils.mkdirhier(uninative_outdir) | 282 | bb.utils.mkdirhier(uninative_outdir) |
283 | shutil.copy(uninative_file, uninative_outdir) | 283 | shutil.copy(uninative_file, uninative_outdir) |
284 | 284 | ||
285 | env_whitelist = (d.getVar('BB_ENV_PASSTHROUGH_ADDITIONS') or '').split() | 285 | env_passthrough = (d.getVar('BB_ENV_PASSTHROUGH_ADDITIONS') or '').split() |
286 | env_whitelist_values = {} | 286 | env_passthrough_values = {} |
287 | 287 | ||
288 | # Create local.conf | 288 | # Create local.conf |
289 | builddir = d.getVar('TOPDIR') | 289 | builddir = d.getVar('TOPDIR') |
@@ -294,15 +294,15 @@ python copy_buildsystem () { | |||
294 | if derivative: | 294 | if derivative: |
295 | shutil.copyfile(builddir + '/conf/local.conf', baseoutpath + '/conf/local.conf') | 295 | shutil.copyfile(builddir + '/conf/local.conf', baseoutpath + '/conf/local.conf') |
296 | else: | 296 | else: |
297 | local_conf_whitelist = (d.getVar('ESDK_LOCALCONF_ALLOW') or '').split() | 297 | local_conf_allowed = (d.getVar('ESDK_LOCALCONF_ALLOW') or '').split() |
298 | local_conf_blacklist = (d.getVar('ESDK_LOCALCONF_REMOVE') or '').split() | 298 | local_conf_remove = (d.getVar('ESDK_LOCALCONF_REMOVE') or '').split() |
299 | def handle_var(varname, origvalue, op, newlines): | 299 | def handle_var(varname, origvalue, op, newlines): |
300 | if varname in local_conf_blacklist or (origvalue.strip().startswith('/') and not varname in local_conf_whitelist): | 300 | if varname in local_conf_remove or (origvalue.strip().startswith('/') and not varname in local_conf_allowed): |
301 | newlines.append('# Removed original setting of %s\n' % varname) | 301 | newlines.append('# Removed original setting of %s\n' % varname) |
302 | return None, op, 0, True | 302 | return None, op, 0, True |
303 | else: | 303 | else: |
304 | if varname in env_whitelist: | 304 | if varname in env_passthrough: |
305 | env_whitelist_values[varname] = origvalue | 305 | env_passthrough_values[varname] = origvalue |
306 | return origvalue, op, 0, True | 306 | return origvalue, op, 0, True |
307 | varlist = ['[^#=+ ]*'] | 307 | varlist = ['[^#=+ ]*'] |
308 | oldlines = [] | 308 | oldlines = [] |
@@ -356,7 +356,7 @@ python copy_buildsystem () { | |||
356 | # We want to be able to set this without a full reparse | 356 | # We want to be able to set this without a full reparse |
357 | f.write('BB_HASHCONFIG_IGNORE_VARS:append = " SIGGEN_UNLOCKED_RECIPES"\n\n') | 357 | f.write('BB_HASHCONFIG_IGNORE_VARS:append = " SIGGEN_UNLOCKED_RECIPES"\n\n') |
358 | 358 | ||
359 | # Set up whitelist for run on install | 359 | # Set up which tasks are ignored for run on install |
360 | f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n') | 360 | f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n') |
361 | 361 | ||
362 | # Hide the config information from bitbake output (since it's fixed within the SDK) | 362 | # Hide the config information from bitbake output (since it's fixed within the SDK) |
@@ -438,7 +438,7 @@ python copy_buildsystem () { | |||
438 | # Ensure any variables set from the external environment (by way of | 438 | # Ensure any variables set from the external environment (by way of |
439 | # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration | 439 | # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration |
440 | extralines = [] | 440 | extralines = [] |
441 | for name, value in env_whitelist_values.items(): | 441 | for name, value in env_passthrough_values.items(): |
442 | actualvalue = d.getVar(name) or '' | 442 | actualvalue = d.getVar(name) or '' |
443 | if value != actualvalue: | 443 | if value != actualvalue: |
444 | extralines.append('%s = "%s"\n' % (name, actualvalue)) | 444 | extralines.append('%s = "%s"\n' % (name, actualvalue)) |