diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/sanity.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index e907a3566f..29cc42efe7 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -227,7 +227,7 @@ def check_toolchain_tune(data, tune, multilib): | |||
227 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + multilib | 227 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + multilib |
228 | localdata.setVar("OVERRIDES", overrides) | 228 | localdata.setVar("OVERRIDES", overrides) |
229 | bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib)) | 229 | bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib)) |
230 | features = (localdata.getVar("TUNE_FEATURES_tune-%s" % tune) or "").split() | 230 | features = (localdata.getVar("TUNE_FEATURES:tune-%s" % tune) or "").split() |
231 | if not features: | 231 | if not features: |
232 | return "Tuning '%s' has no defined features, and cannot be used." % tune | 232 | return "Tuning '%s' has no defined features, and cannot be used." % tune |
233 | valid_tunes = localdata.getVarFlags('TUNEVALID') or {} | 233 | valid_tunes = localdata.getVarFlags('TUNEVALID') or {} |
@@ -249,7 +249,7 @@ def check_toolchain_tune(data, tune, multilib): | |||
249 | tune_errors.append("Feature '%s' is not defined." % feature) | 249 | tune_errors.append("Feature '%s' is not defined." % feature) |
250 | whitelist = localdata.getVar("TUNEABI_WHITELIST") | 250 | whitelist = localdata.getVar("TUNEABI_WHITELIST") |
251 | if whitelist: | 251 | if whitelist: |
252 | tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune) | 252 | tuneabi = localdata.getVar("TUNEABI:tune-%s" % tune) |
253 | if not tuneabi: | 253 | if not tuneabi: |
254 | tuneabi = tune | 254 | tuneabi = tune |
255 | if True not in [x in whitelist.split() for x in tuneabi.split()]: | 255 | if True not in [x in whitelist.split() for x in tuneabi.split()]: |
@@ -281,7 +281,7 @@ def check_toolchain(data): | |||
281 | seen_libs.append(lib) | 281 | seen_libs.append(lib) |
282 | if not lib in global_multilibs: | 282 | if not lib in global_multilibs: |
283 | tune_error_set.append("Multilib %s is not present in MULTILIB_GLOBAL_VARIANTS" % lib) | 283 | tune_error_set.append("Multilib %s is not present in MULTILIB_GLOBAL_VARIANTS" % lib) |
284 | tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib) | 284 | tune = data.getVar("DEFAULTTUNE:virtclass-multilib-%s" % lib) |
285 | if tune in seen_tunes: | 285 | if tune in seen_tunes: |
286 | tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune) | 286 | tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune) |
287 | else: | 287 | else: |