diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 20:33:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
commit | 71ef3191938da772b07274165dd3a85c2ed011f1 (patch) | |
tree | fd830ada451fec669352cb0dfc1bb316ea9cefd8 /meta/classes/populate_sdk_ext.bbclass | |
parent | 5a3d6c7bda0f158473c82d1c38ae2df26192dccb (diff) | |
download | poky-71ef3191938da772b07274165dd3a85c2ed011f1.tar.gz |
meta/scripts: Automated conversion of OE renamed variables
(From OE-Core rev: aa52af4518604b5bf13f3c5e885113bf868d6c81)
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index a6f1506a39..9c9561c5c6 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -22,8 +22,8 @@ SDK_INCLUDE_BUILDTOOLS ?= '1' | |||
22 | SDK_RECRDEP_TASKS ?= "" | 22 | SDK_RECRDEP_TASKS ?= "" |
23 | SDK_CUSTOM_TEMPLATECONF ?= "0" | 23 | SDK_CUSTOM_TEMPLATECONF ?= "0" |
24 | 24 | ||
25 | SDK_LOCAL_CONF_WHITELIST ?= "" | 25 | ESDK_LOCALCONF_ALLOW ?= "" |
26 | SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ | 26 | ESDK_LOCALCONF_REMOVE ?= "CONF_VERSION \ |
27 | BB_NUMBER_THREADS \ | 27 | BB_NUMBER_THREADS \ |
28 | BB_NUMBER_PARSE_THREADS \ | 28 | BB_NUMBER_PARSE_THREADS \ |
29 | PARALLEL_MAKE \ | 29 | PARALLEL_MAKE \ |
@@ -34,7 +34,7 @@ SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ | |||
34 | TMPDIR \ | 34 | TMPDIR \ |
35 | BB_SERVER_TIMEOUT \ | 35 | BB_SERVER_TIMEOUT \ |
36 | " | 36 | " |
37 | SDK_INHERIT_BLACKLIST ?= "buildhistory icecc" | 37 | ESDK_CLASS_INHERIT_DISABLE ?= "buildhistory icecc" |
38 | SDK_UPDATE_URL ?= "" | 38 | SDK_UPDATE_URL ?= "" |
39 | 39 | ||
40 | SDK_TARGETS ?= "${PN}" | 40 | SDK_TARGETS ?= "${PN}" |
@@ -294,8 +294,8 @@ 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('SDK_LOCAL_CONF_WHITELIST') or '').split() | 297 | local_conf_whitelist = (d.getVar('ESDK_LOCALCONF_ALLOW') or '').split() |
298 | local_conf_blacklist = (d.getVar('SDK_LOCAL_CONF_BLACKLIST') or '').split() | 298 | local_conf_blacklist = (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_blacklist or (origvalue.strip().startswith('/') and not varname in local_conf_whitelist): |
301 | newlines.append('# Removed original setting of %s\n' % varname) | 301 | newlines.append('# Removed original setting of %s\n' % varname) |
@@ -338,7 +338,7 @@ python copy_buildsystem () { | |||
338 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) | 338 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) |
339 | 339 | ||
340 | # Some classes are not suitable for SDK, remove them from INHERIT | 340 | # Some classes are not suitable for SDK, remove them from INHERIT |
341 | f.write('INHERIT:remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST', False)) | 341 | f.write('INHERIT:remove = "%s"\n' % d.getVar('ESDK_CLASS_INHERIT_DISABLE', False)) |
342 | 342 | ||
343 | # Bypass the default connectivity check if any | 343 | # Bypass the default connectivity check if any |
344 | f.write('CONNECTIVITY_CHECK_URIS = ""\n\n') | 344 | f.write('CONNECTIVITY_CHECK_URIS = ""\n\n') |