From 785cd756d56df66edf9255c54c62c2f771c324b8 Mon Sep 17 00:00:00 2001 From: Wayne Ren Date: Wed, 10 Nov 2021 23:03:42 +0800 Subject: [PATCH] do some code style clean and typo fixes * bbclash->bbclass * replace HM** with EULER * replace deprecated e.data.xxx with d.xxxx Signed-off-by: Wayne Ren --- meta-openeuler/classes/eulertoolchain.bbclass | 21 +++++++++---------- ...onfig.bbclash => get_euler_config.bbclass} | 0 2 files changed, 10 insertions(+), 11 deletions(-) rename meta-openeuler/classes/{get_euler_config.bbclash => get_euler_config.bbclass} (100%) diff --git a/meta-openeuler/classes/eulertoolchain.bbclass b/meta-openeuler/classes/eulertoolchain.bbclass index 39670fd598f..7529057b2c4 100644 --- a/meta-openeuler/classes/eulertoolchain.bbclass +++ b/meta-openeuler/classes/eulertoolchain.bbclass @@ -20,30 +20,29 @@ def eulertoolchain_euler_prefix_to_raw(euler_prefix): return eulertoolchain_raw_prefix(arch) python eulertoolchain_virtclass_handler () { - cls = e.data.getVar("BBEXTENDCURR") - variant = e.data.getVar("BBEXTENDVARIANT") + cls = d.getVar("BBEXTENDCURR") + variant = d.getVar("BBEXTENDVARIANT") if cls != "eulertoolchain" or not variant: return - e.data.setVar("PN", e.data.getVar("PN", False) + '-' + variant) - e.data.setVar("TARGET_ARCH", variant) + d.setVar("PN", d.getVar("PN", False) + '-' + variant) + d.setVar("TARGET_ARCH", variant) - e.data.setVar("EULER_TOOLCHAIN_SYSNAME", eulertoolchain_raw_prefix(variant)) - e.data.setVar("EULER_TOOLCHAIN_TARGET_PREFIX", eulertoolchain_euler_prefix(variant) + '-') - e.data.setVar("EULER_TOOLCHAIN_TARGET_PREFIX_RAW", eulertoolchain_euler_prefix(variant)) + d.setVar("EULER_TOOLCHAIN_SYSNAME", eulertoolchain_raw_prefix(variant)) + d.setVar("EULER_TOOLCHAIN_TARGET_PREFIX", eulertoolchain_euler_prefix(variant) + '-') + d.setVar("EULER_TOOLCHAIN_TARGET_PREFIX_RAW", eulertoolchain_euler_prefix(variant)) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + ":{}".format(variant.replace('_', '-'))) } addhandler eulertoolchain_virtclass_handler eulertoolchain_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" -#_HMTOOLCHAIN_SUPPORT_ARCHS := "aarch64 aarch64_be arm armeb" -_HMTOOLCHAIN_SUPPORT_ARCHS := "aarch64 arm" +_EULERTOOLCHAIN_SUPPORT_ARCHS := "aarch64 arm" def toolchain_bbclassextend(d, cls, variant): - support_archs = d.getVar("_HMTOOLCHAIN_SUPPORT_ARCHS", True) + support_archs = d.getVar("_EULERTOOLCHAIN_SUPPORT_ARCHS", True) exts = [] for arch in support_archs.split(): exts.append('{}:{}{}'.format(cls, variant, arch)) diff --git a/meta-openeuler/classes/get_euler_config.bbclash b/meta-openeuler/classes/get_euler_config.bbclass similarity index 100% rename from meta-openeuler/classes/get_euler_config.bbclash rename to meta-openeuler/classes/get_euler_config.bbclass -- Gitee