openubmc-bingo 0.6.33__py3-none-any.whl → 0.6.43__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.33'
+__version__ = '0.6.43'

bmcgo/cli/cli.py

@@ -674,6 +674,7 @@ def run(args, command: Command = None):
     os.makedirs(misc.CACHE_DIR, exist_ok=True)
 
     try:
+        tools.run_command("whoami", show_log=True)
         prepare_conan()
         if not command:
             command = Command()

bmcgo/codegen/lua/script/render_utils/messages_lua.py

@@ -25,6 +25,10 @@ class MessagesLuaUtils(Base, Utils):
         "Critical": "log.ERROR"
     }
 
+    DEFAULT_PARAMS_MAP = {
+        "ResetOperationNotAllowed": " or 'The current status does not support the reset operation'"
+    }
+
     def __init__(self, data: dict, options: Options):
         super().__init__(data, options=options)
 
@@ -144,6 +148,9 @@ class MessagesLuaUtils(Base, Utils):
             return ""
         return f", {params}"
 
+    def fill_default_params(self, name):
+        return MessagesLuaUtils.DEFAULT_PARAMS_MAP.get(name, "")
+
     def params(self, msg):
         placeholders = self.match_placeholders(msg)
         if len(placeholders) == 0:

bmcgo/codegen/lua/templates/messages.lua.mako

@@ -25,7 +25,7 @@ M.${name}Message = {
 }
 ---@return Error
 function M.${name}(${params})
-    return create_error(M.${name}Message${render_utils.error_params(err)})
+    return create_error(M.${name}Message${render_utils.error_params(err)}${render_utils.fill_default_params(name)})
 end
 
 % endfor

bmcgo/component/analysis/analysis.py

@@ -40,12 +40,19 @@ class AnalysisComp():
         if not self.artifact_dir:
             self.artifact_dir = os.path.join(os.getcwd(), "..", "output/packet/inner")
         if not lock_file:
-            self.lock_file = os.path.join(os.getcwd(), "..", "output/package.lock")
+            graph_file_name = "package.lock" if misc.conan_v1() else "graph.info"
+            self.lock_file = os.path.join(os.getcwd(), "..", f"output/{graph_file_name}")
         self.nodes: list[DepNode] = []
         self.subsystems = {}
         self.rules: list[Rules] = []
         self.rule_file = os.path.join(script_dir, "dep-rules.json")
 
+    @staticmethod
+    def process_str(input_str):
+        if misc.conan_v2():
+            return input_str.lower()
+        return input_str
+
     def read_rules(self):
         if not os.path.isfile(self.rule_file):
             raise Exception(f"依赖规则文件 {self.rule_file} 不存在")
@@ -58,19 +65,19 @@ class AnalysisComp():
             subsys = SubSys(int(level))
             apps = sys_data.get("Apps", [])
             for app in apps:
-                subsys.apps.append(app)
+                subsys.apps.append(self.process_str(app))
             libs = sys_data.get("Libraries", [])
             for lib in libs:
-                subsys.libraries.append(lib)
+                subsys.libraries.append(self.process_str(lib))
             tools = sys_data.get("Tools", [])
             for tool in tools:
-                subsys.tools.append(tool)
+                subsys.tools.append(self.process_str(tool))
             configurations = sys_data.get("Configurations", [])
             for config in configurations:
-                subsys.configurations.append(config)
+                subsys.configurations.append(self.process_str(config))
             commands = sys_data.get("Commands", [])
             for cmd in commands:
-                subsys.commands.append(cmd)
+                subsys.commands.append(self.process_str(cmd))
             self.subsystems[sub] = subsys
         self.rules.append(Rules(rules.get("Allowed", []), True))
         self.rules.append(Rules(rules.get("UnAllowed", []), False))
@@ -102,16 +109,22 @@ class AnalysisComp():
             lock = json.load(file_descriptor)
         requires: dict = {}
         packages = {}
+        graph_str = "graph_lock" if misc.conan_v1() else "graph"
         for i in range(0, 10000):
-            node_data = lock.get("graph_lock", {}).get("nodes", {}).get(str(i), None)
+            node_data = lock.get(graph_str, {}).get("nodes", {}).get(str(i), None)
             if not node_data:
                 break
             node = DepNode(node_data, i)
             # busybox是调测包，当dev包引入时忽略架构治理分析（由schema模型看护）
-            if node.package_name == "busybox" and "/dev" in node.ref:
+            excluded_str = "/dev" if misc.conan_v1() else "openubmc"
+            if node.package_name == "busybox" and excluded_str in node.ref:
                 continue
             packages[node.index] = node
             requires[node.index] = node_data.get("requires", [])
+            if misc.conan_v2():
+                dependencies_data = node_data.get("dependencies", [])
+                dependencies_keys = list(dependencies_data.keys())
+                requires[node.index] = dependencies_keys
         comm_name = misc.community_name()
         for index, pkg in packages.items():
             if not pkg.name.startswith(comm_name):

bmcgo/component/analysis/data_deps.py

@@ -129,10 +129,15 @@ class DataDependenciesAnalysis(SrParser):
             if node.package_name == 'vpd':
                 pkg_dir = node.ref.split("#")[0].replace("@", "/")
                 sr_dir = os.path.join(os.environ["HOME"], CONAN_DATA, pkg_dir, "source")
+                if misc.conan_v2():
+                    sr_dir = os.path.join(node.recipe_folder, "..", "s")
             if node.package_name == 'mdb_interface':
                 pkg_dir = node.ref.split("#")[0].replace("@", "/")
                 mdb_interface_dir = os.path.join(os.environ["HOME"], CONAN_DATA, pkg_dir,
                 "package", node.package_id, "opt/bmc/apps/mdb_interface/intf/mdb/bmc")
+                if misc.conan_v2():
+                    mdb_interface_dir = os.path.join(node.package_folder, 
+                    "opt/bmc/apps/mdb_interface/intf/mdb/bmc")
         if custom_sr_dir:
             sr_dir = custom_sr_dir
         super().__init__(sr_dir)

bmcgo/component/analysis/dep-rules.json

@@ -42,6 +42,7 @@
                 "libyaml",
                 "opentelemetry",
                 "grpc",
+                "grpc_tool",
                 "abseil",
                 "protobuf",
                 "re2",
@@ -68,7 +69,9 @@
                 "storagecore"
             ],
             "Tools": [
-                "meta_template"
+                "meta_template",
+                "bison",
+                "flex"
             ],
             "Apps": [
                 "secbox"
@@ -113,7 +116,8 @@
                 "libmdbc",
                 "libmcc",
                 "libmgmt_protocol",
-                "libkvs"
+                "libkvs",
+                "liblogger"
             ],
             "Configurations": [
                 "rootfs_user"

bmcgo/component/analysis/dep_node.py

@@ -16,9 +16,12 @@ import sys
 
 from typing import List, Set
 from bmcgo.logger import Logger
+from bmcgo.utils.tools import Tools
+from bmcgo import misc
 
 global log
 log = Logger()
+tools = Tools()
 
 TABLE_CONFLICT_WHITE_LIST = {"nsm": "t_snmp_config", "event_policy": "t_snmp_config"}
 
@@ -48,6 +51,14 @@ class DepNode():
         self.local_tables = {}
         self.remote_tables = {}
         self.table_conflict = False
+        if misc.conan_v2():
+            self.recipe_folder = node.get("recipe_folder")
+            self.binary = node.get("binary", "")
+            if self.binary == "Skip":
+                return
+            result = tools.run_command(f"conan cache path {self.ref}:{self.package_id}",
+                                       capture_output=True, text=True)
+            self.package_folder = str(result.stdout).strip()
         self._parse_mds()
 
     @staticmethod
@@ -92,6 +103,8 @@ class DepNode():
     def _parse_mds(self):
         pkg_dir = self.ref.split("#")[0].replace("@", "/")
         package_source = os.path.join(os.environ["HOME"], ".conan/data", pkg_dir, "package", self.package_id)
+        if misc.conan_v2():
+            package_source = self.package_folder
         mds_path = os.path.join(package_source, "include/mds")
         self.model_path = os.path.join(mds_path, "model.json")
         if os.path.exists(self.model_path):

bmcgo/component/package_info.py

@@ -242,7 +242,7 @@ class InfoComp():
     def _conan_define_v2(self):
         self.package = "%s/%s@%s/%s" % (self.name, self.version, self.user, self.stage)
         profiles = [f"-pr:h {self.profile}"]
-        profiles.append("-pr:b default")
+        profiles.append("-pr:b profile.dt.ini")
         if self.enable_luajit:
             self.options.append("*/*:enable_luajit=True")
         if self.build_type == "debug":

bmcgo/component/template_v2/conanbase.py.mako

@@ -22,16 +22,13 @@ import shutil
 from conan import ConanFile
 from conan.tools.scm import Git
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import copy, update_conandata, chdir, rm
-from conan.errors import ConanInvalidConfiguration
+from conan.tools.files import copy, update_conandata, chdir, rm, mkdir
 % if language == "c":
 from bmcgo.component.gen import GenComp
 % endif
 % if pkg.is_maintain:
-from conans import tools
-from conans.util.files import mkdir
 from conan.tools.files import patch as apply_patch
-from conans.errors import ConanException
+from conan.errors import ConanException
 % endif
 
 urllib3.disable_warnings()
@@ -105,17 +102,20 @@ class ConanBase(ConanFile):
             update_conandata(self, {"sources": {self.version: {"branch": None, "url": None, "pwd": os.getcwd(), "timestamp": int(time.time())}}})
             return
         url = None
+        url_remote = None
         commit = git.get_commit()
         branches = git.run("branch -r --contains {}".format(commit))
         remotes = git.run("remote")
         for remote in remotes.splitlines():
             if "{}/".format(remote) in branches:
                 url = git.get_remote_url(remote)
+                url_remote = remote
                 break
         if not url:
             update_conandata(self, {"sources": {self.version: {"branch": None, "url": None, "pwd": os.getcwd(), "timestamp": int(time.time())}}})
             return
         try:
+            self.run(f"git fetch --prune --prune-tags {url_remote}")
             tag = git.run(f"tag --points-at HEAD | grep -m 1 {self.version}")
         except:
             tag = ""
@@ -132,7 +132,7 @@ class ConanBase(ConanFile):
             # 与export_conandata_patches方法不同点：所有patches将从recipes_folder/../pacthes读取
             src = os.path.join(self.recipe_folder, "..", patch_file)
             dst = os.path.join(self.export_sources_folder, patch_file)
-            mkdir(os.path.dirname(dst))
+            mkdir(self, os.path.dirname(dst))
             shutil.copy2(src, dst)
 
     % endif
@@ -150,28 +150,7 @@ class ConanBase(ConanFile):
         % if language == "c":
         self._codegen()
         % endif
-
-    def generate(self):
-        tc = self._pre_generate()
-        tc.generate()
-
-% if pkg.is_maintain:
-    @staticmethod
-    def _get_patch_changed_files(patch_file):
-        files = {}
-        for line in open(patch_file):
-            if not line.startswith("diff --git"):
-                continue
-            line = line.strip()
-            chunk = line.split()
-            a_file = chunk[-2][2:]
-            b_file = chunk[-1][2:]
-            files[a_file] = b_file
-        return files
-
-%endif
-    def build(self):
-% if pkg.is_maintain:
+    % if pkg.is_maintain:
         for patch in self.conan_data.get("patches", {}).get(self.version, []):
             patch_file = patch.get("patch_file")
             if not patch_file:
@@ -193,7 +172,28 @@ class ConanBase(ConanFile):
                     self.run(cmd, ignore_errors=True)
                 cmd = "git am " + real_path
                 self.run(cmd)
-% endif
+    % endif
+
+    def generate(self):
+        tc = self._pre_generate()
+        tc.generate()
+
+% if pkg.is_maintain:
+    @staticmethod
+    def _get_patch_changed_files(patch_file):
+        files = {}
+        for line in open(patch_file):
+            if not line.startswith("diff --git"):
+                continue
+            line = line.strip()
+            chunk = line.split()
+            a_file = chunk[-2][2:]
+            b_file = chunk[-1][2:]
+            files[a_file] = b_file
+        return files
+
+%endif
+    def build(self):
         cmake = self._configure_cmake()
         cmake.build()
 

bmcgo/functional/maintain.py

@@ -92,11 +92,9 @@ class BmcgoCommand:
         self.bconfig = bconfig
         parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} maintain", description="BMC组件的维护管理工具",
                                          add_help=True, formatter_class=argparse.RawTextHelpFormatter)
-        if misc.conan_v1():
-            parser.add_argument("-cp", "--conan_package", help="指定需要维护的组件版本，示例：component/1.2.3", required=True)
-        else:
-            parser.add_argument("-cp", "--conan_package",
+        parser.add_argument("-cp", "--conan_package",
                                 help="指定需要维护的组件版本，示例：component/1.2.3@{misc.conan_user()}/stable", required=True)
+        parser.add_argument("--conan2", help="是否生成conan2.x版本的维护组件包", action=misc.STORE_TRUE)
         parser.add_argument("-p", "--patch_file", help="添加patch文件，可指定多个，顺序追加到代码中", action='append')
         parser.add_argument("-b", "--branch", help="用于提取patch的分支，与commit_id配合使用", default="master")
         parser.add_argument("-c", "--commit_id", help="需要生成patch的提交节点，长度不低于8个字符，可指定多个，顺序追加到代码中",
@@ -106,20 +104,9 @@ class BmcgoCommand:
                             help="conan远程仓，请检查conan remote list查看已配置的conan仓")
         parsed_args = parser.parse_args(*args)
         cp = parsed_args.conan_package
-        if misc.conan_v1():
-            if (not re.match("^[a-zA-Z0-9_-]+/([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+$", cp) and
-            not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)$", cp) and
-            not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(.p[0-9]+)$" + cp)):
-                raise errors.BmcGoException("-cp参数错误，不满足格式\"<name>/<version>\"要求")
-        else:
-            restr = misc.CONAN_NAME_RESTR
-            if (not re.match(f"^{restr}/([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+@{restr}/{restr}$", cp) and
-            not re.match(f"^{restr}/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)@{restr}/{restr}$", cp) and
-            not re.match(f"^{restr}/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(.p[0-9]+)@{restr}/{restr}$" + cp)):
-                raise errors.BmcGoException("-cp参数错误，不满足格式\"<name>/<version>@user/channel\"要求")
         self.conan_package = cp
         self.name = self.conan_package.split("/")[0]
-        self.base_version = self.conan_package.split("/")[1]
+        self.base_version = self.conan_package.split("/")[1].split("@")[0]
         self.remote = parsed_args.remote
         self.arg_special_version = parsed_args.version
         if parsed_args.patch_file is None:
@@ -158,6 +145,10 @@ class BmcgoCommand:
         bconfig = BmcgoConfig()
         comp = BuildComp(bconfig, ["--maintain"], gen_conanbase=True)
         self.recipe_folder = os.path.join(self.bconfig.conan_index.folder, comp.info.name)
+        if misc.conan_v2():
+            recipe2_folder = os.path.join(self.bconfig.conan_index.folder, "..", "recipes2")
+            recipe2_folder = os.path.realpath(recipe2_folder)
+            self.recipe_folder = os.path.join(recipe2_folder, comp.info.name)
         if not os.path.isdir(self.recipe_folder):
             os.makedirs(self.recipe_folder)
         self._update_next_version()
@@ -194,37 +185,19 @@ class BmcgoCommand:
         log.success(f"生成维护版本 {self.name}/{self.next_version} 成功")
         return 0
 
-    def _fetch_conan_info_v2(self):
-        args = "--only-recipe" if misc.conan_v2() else "--recipe"
-        cmd = f"conan download {self.conan_package} -r {self.remote} {args}"
-        tool.run_command(cmd, error_log=f"组件 {self.conan_package} 未找到，请检查网络连接以及该版本是否已发布")
-        cmd = f"conan cache path {self.conan_package}"
-        export_path = tool.run_command(cmd, capture_output=True, shell=True).stdout.strip()
-        conanfile = os.path.join(export_path, "conanfile.py")
-        conandata = os.path.join(export_path, "conandata.yml")
-        if not os.path.isfile(conandata):
-            raise errors.BmcGoException(f"未找到组件 {self.conan_package} 的conandata.yml文件")
-        log.info(f"从 {conandata} 读取源码tag的url")
-        # 尝试从conandata中获取代码仓地址
-        with open(conandata, "r") as fp:
-            data = yaml.safe_load(fp)
-        cfg = data.get("sources", {}).get(self.base_version)
-        if cfg is None:
-            raise RuntimeError(f"${conandata}不存在组件 {self.conan_package} 配置, 请检查是否正确")
-        self.url = cfg.get("url")
-        self.tag = cfg.get("branch")
-        if re.match("^refs/tags/[0-9]+\\.[0-9]+\\.[0-9]+$", self.tag):
-            self.tag = self.tag[len("refs/tags/"):]
-        elif not self.tag:
-            self.tag = self.base_version
-
-    def _fetch_conan_info_v1(self):
-        user = misc.conan_user()
-        args = "--only-recipe" if misc.conan_v2() else "--recipe"
-        export_path = os.path.join(tool.conan_data, self.conan_package, f"{user}/stable", "export")
-        if not os.path.isdir(export_path):
-            cmd = f"conan download {self.conan_package}@{user}/stable -r {self.remote} {args}"
+    def _fetch_conan_info(self):
+        if misc.conan_v2():
+            cmd = f"conan download {self.conan_package} -r {self.remote} --only-recipe"
             tool.run_command(cmd, error_log=f"组件 {self.conan_package} 未找到，请检查网络连接以及该版本是否已发布")
+            cmd = f"conan cache path {self.conan_package}"
+            export_path = tool.run_command(cmd, capture_output=True, shell=True).stdout.strip()
+        else:
+            conan_package_path = self.conan_package.replace("@", "/")
+            export_path = os.path.join(tool.conan_data, conan_package_path, "export")
+            if not os.path.isdir(export_path):
+                cmd = f"conan download {self.conan_package} -r {self.remote} -re"
+                tool.run_command(cmd, error_log=f"组件 {self.conan_package} 未找到，请检查网络连接以及该版本是否已发布")
+
         conanfile = os.path.join(export_path, "conanfile.py")
         conandata = os.path.join(export_path, "conandata.yml")
         if os.path.isfile(conandata):
@@ -237,7 +210,7 @@ class BmcgoCommand:
                 raise RuntimeError(f"${conandata}不存在组件 {self.conan_package} 配置, 请检查是否正确")
             self.url = cfg.get("url")
             branch = cfg.get("branch")
-            if re.match("^refs/tags/[0-9]+\\.[0-9]+\\.[0-9]+$", branch):
+            if re.match("^refs/tags/[0-9]+\\.[0-9]+\\.[0-9]+", branch):
                 self.tag = branch[len("refs/tags/"):]
             else:
                 raise RuntimeError(f"${conandata}的组件 {self.conan_package} 配置错误, 未找到有效的tag")
@@ -253,28 +226,23 @@ class BmcgoCommand:
             else:
                 raise RuntimeError("无法找到版本(revision)和地址(url)字段")
 
-    def _fetch_conan_info(self):
-        if misc.conan_v1():
-            self._fetch_conan_info_v1()
-        else:
-            self._fetch_conan_info_v2()
-
     def _update_next_version(self):
         self.next_version = self.arg_special_version
         if not self.next_version:
-            if re.match("^(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)$", self.base_version):
+            if re.match("^(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)([-|+]build\.[0-9]+)$", self.base_version):
                 temp_version = self.base_version.split(".")
+                temp_version[-2] = temp_version[-2].replace("-", "+")
                 temp_version[-1] = str(int(temp_version[-1]) + 1)
                 self.next_version = ".".join(temp_version)
             else:
-                self.next_version = self.base_version.split("-")[0] + "-build.1"
+                self.next_version = self.base_version.split("+")[0] + "+build.1"
             log.info(f"自动生成的版本号为 {Fore.GREEN}{self.next_version}{Style.RESET_ALL}")
-            version = input("请回车确认 或者 输入你期望的版本号(必须以-build.x结束，如1.2.3-build.1): ").strip()
+            version = input("请回车确认 或者 输入你期望的版本号(必须以+build.x结束，如1.2.3+build.1): ").strip()
             if version:
                 self.next_version = version
-        if not self.arg_special_version and "-build." not in self.next_version:
-            raise errors.BmcGoException(f"版本号格式必须以-build.x结束，如1.2.3-build.1")
-        restr = r"^(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[1-9][0-9]*)?$"
+        if not self.arg_special_version and "+build." not in self.next_version:
+            raise errors.BmcGoException(f"版本号格式必须以+build.x结束，如1.2.3+build.1")
+        restr = r"^(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(\+build\.[1-9][0-9]*)$"
         match = re.match(restr, self.next_version)
         if not match:
             raise errors.BmcGoException(f"版本号 {self.next_version} 不满足正则表达式 '{restr}' 要求")

bmcgo/tasks/task.py

@@ -236,12 +236,16 @@ class Task(Process):
         # 新增profile文件需要存在在manifest/build/profiles目录
         profiles = os.path.join(self.config.code_path, "profiles")
         if os.path.isdir(profiles):
-            shutil.copytree(profiles, self.conan_profiles_dir, dirs_exist_ok=True)
+            self.run_command(f"cp -rf {profiles}/. {self.conan_profiles_dir}")
         platform_profiles = os.path.join(self.config.temp_platform_build_dir, "profiles")
         if os.path.isdir(platform_profiles):
-            shutil.copytree(platform_profiles, self.conan_profiles_dir, dirs_exist_ok=True)
+            self.run_command(f"cp -rf {platform_profiles}/. {self.conan_profiles_dir}")
+
+        if self.config.manifest_sdk_flag:
+            if os.path.isdir(profiles):
+                self.run_command(f"cp -rf {profiles}/. {self.conan_profiles_dir}")
         self.run_command("conan remote remove conancenter", ignore_error=True)
-    
+
     def check_need_install(self, download_dir_path, old_sha, new_sha):
         need_install_flag = True
         # 计算sha256

bmcgo/tasks/task_build_conan.py

@@ -692,9 +692,9 @@ class TaskClass(Task):
 
     def calc_options_v2(self):
         if self.config.build_type == "debug":
-            options = "-s build_type=Debug"
+            options = "-s:a build_type=Debug"
         else:
-            options = "-s build_type=Release"
+            options = "-s:a build_type=Release"
 
         if self.config.enable_arm_gcov:
             options += " -o */*:gcov=True"

bmcgo/tasks/task_build_rootfs_img.py

@@ -358,9 +358,7 @@ class TaskClass(Task):
         base.append("grep -v \".target$\"")
         if self.config.build_type == "debug":
             # so库一般带有版本号，此处不能注明具体的版本号，否则可能导致版本变更时不能正确strip
-            not_striped_list = ["rootfs/opt/bmc", "libclp_common.so", "libclp_private_cmd.so", "libcutils.so"]
-            not_striped_list += ["libfilehook.so", "liblogging.so", "liblua.so", "libmctp.so", "libnsm_kmc.so"]
-            not_striped_list += ["libplatform.so", "libsnmp.so", "libsoc_adapter.so", "libuip.so"]
+            not_striped_list = ["rootfs/opt/bmc"]
             for file in not_striped_list:
                 base.append("grep -v \"{}\"".format(file))
         base.append("sudo xargs -P 0 -I {{}} file {{}}".format(file_list))

bmcgo/tasks/task_download_buildtools.py

@@ -15,10 +15,6 @@
 修改记录：2021-10-11 创建
 '''
 import os
-import tempfile
-import shutil
-from pathlib import Path
-from urllib.parse import urlparse
 
 from bmcgo.tasks.task import Task
 from bmcgo.tasks.misc import BUILD_TOOLS_SHA256_PATH
@@ -77,79 +73,7 @@ class DownloadDefaultBuildtools(Task):
         self.run_command("cp -af {} {}".format(self.buildtools_new_sha256, BUILD_TOOLS_SHA256_PATH), sudo=True)
         self.run_command("chmod a+r {}".format(BUILD_TOOLS_SHA256_PATH), sudo=True)
 
-    def download_sdk(self):
-        downloads = self.get_manufacture_config("sdk/downloads")
-        if downloads is None:
-            self.log.warning("请在 manifest.yml 配置 sdk 字段或更新 manifest 仓库")
-            return
-
-        download_path = Path.home() / "downloads"
-        download_path.mkdir(exist_ok=True, parents=True)
-
-        for item in downloads:
-            self.log.info(f"配置 {item['name']}...")
-
-            curr_file_name = Path(urlparse(item['url']).path).name
-            curr_file = download_path / curr_file_name
-            curr_file_path = curr_file.as_posix()
-
-            need_download = True
-            if curr_file.exists():
-                curr_pkg_sha256 = self.tools.sha256sum(curr_file_path)
-                if curr_pkg_sha256 == item['sha256']:
-                    self.log.info(f"已下载 {item["name"]}, 跳过.")
-                    need_download = False
-
-            if need_download:
-                with tempfile.TemporaryDirectory() as tmp:
-                    self.log.info(f"开始下载 {item['url']}...")
-                    download_pkg_path = os.path.join(tmp, curr_file_name)
-                    self.tools.download_file(item['url'], download_pkg_path)
-                    downloaded_sha256 = self.tools.sha256sum(download_pkg_path)
-
-                    if item['sha256'] != downloaded_sha256:
-                        raise RuntimeError(f"manifest.yml /sdk/downloads/{item['name']} sha256 内容和下载包体不符，请检查配置！")
-
-                    shutil.move(download_pkg_path, curr_file_path)
-
-            if hasattr(self, f"install_{item['name']}"):
-                getattr(self, f"install_{item['name']}")(curr_file_path)
-            
-            self.log.info(f"配置 {item['name']} 完成！")
-
-    def install_bmc_sdk(self, zip_path):
-        with tempfile.TemporaryDirectory() as tmp:
-            self.log.info("安装 bmc_sdk")
-            home_path = Path.home().as_posix()
-            real_path = zip_path
-
-            self.log.debug(f"解压 {real_path} 到 {tmp}")
-            self.run_command(f"unzip {real_path} -d {tmp}")
-            
-            rtos_compiler_path = Path.home() / "rtos_compiler"
-            if rtos_compiler_path.exists():
-                shutil.rmtree(rtos_compiler_path)
-
-            sdk_path = Path.home() / "sdk"
-            if sdk_path.exists():
-                shutil.rmtree(sdk_path)
-
-            self.log.debug(f"move {tmp}/rtos_compiler -> {home_path}")
-            self.run_command(f"mv {tmp}/rtos_compiler/ {home_path}")
-            self.log.debug(f"move {tmp}/sdk -> {home_path}")
-            self.run_command(f"mv {tmp}/sdk/ {home_path}")
-            self.log.debug(f"move {tmp}/lua-format -> /usr/bin")
-            self.run_command(f"chmod +x {tmp}/lua-format")
-            self.run_command(f"mv -f {tmp}/lua-format /usr/bin/", sudo=True)
-
-            self.log.debug(f"copy {tmp}/hpm_tools/. -> {home_path}")
-            self.run_command(f"chmod -R +x {tmp}/hpm_tools")
-            self.run_command(f"cp -rf {tmp}/hpm_tools/. /usr/local/bin/", sudo=True)
-
-            self.log.info(f"安装 bmc_sdk 完成！")
-
     def run(self):
-        self.download_sdk()
         self.download_tools()
         self.info("下载依赖工具结束")
 

bmcgo/tasks/task_prepare.py

@@ -18,8 +18,11 @@
 import os
 import json
 import shutil
-import jsonschema
+from pathlib import Path
+import tempfile
+import shutil
 import yaml
+import jsonschema
 from bmcgo.tasks.task import Task
 from bmcgo import misc
 from bmcgo import errors
@@ -95,6 +98,54 @@ class TaskClass(Task):
         self.schema_subsys_valid("rc")
         self.schema_subsys_valid("stable")
 
+    def pre_download(self):
+        downloads = self.get_manufacture_config("pre_download", {})
+        if downloads is None:
+            self.log.warning("请在 manifest.yml 配置 sdk 字段或更新 manifest 仓库")
+            return
+
+        download_path = os.path.join(self.config.temp_path, "downloads")
+        os.makedirs(download_path, exist_ok=True)
+        for key, item in downloads.items():
+            sha256 = item['sha256']
+            url = item['url']
+            dst_file = os.path.join(download_path, sha256)
+            self.info(f"开始下载 {url} 到 {dst_file}")
+            self.tools.download_file(key, url, dst_file, sha256)
+            if key == "bmc_sdk":
+                self.install_bmc_sdk(dst_file)
+
+    def install_bmc_sdk(self, zip_path):
+        with tempfile.TemporaryDirectory() as tmp:
+            self.log.info("安装 bmc_sdk")
+            home_path = Path.home().as_posix()
+            real_path = zip_path
+
+            self.log.debug(f"解压 {real_path} 到 {tmp}")
+            self.run_command(f"unzip {real_path} -d {tmp}")
+
+            rtos_compiler_path = Path.home() / "rtos_compiler"
+            if rtos_compiler_path.exists():
+                shutil.rmtree(rtos_compiler_path)
+
+            sdk_path = Path.home() / "sdk"
+            if sdk_path.exists():
+                shutil.rmtree(sdk_path)
+
+            self.log.debug(f"move {tmp}/rtos_compiler -> {home_path}")
+            self.run_command(f"mv {tmp}/rtos_compiler/ {home_path}")
+            self.log.debug(f"move {tmp}/sdk -> {home_path}")
+            self.run_command(f"mv {tmp}/sdk/ {home_path}")
+            self.log.debug(f"move {tmp}/lua-format -> /usr/bin")
+            self.run_command(f"chmod +x {tmp}/lua-format")
+            self.run_command(f"mv -f {tmp}/lua-format /usr/bin/", sudo=True)
+
+            self.log.debug(f"copy {tmp}/hpm_tools/. -> {home_path}")
+            self.run_command(f"chmod -R +x {tmp}/hpm_tools")
+            self.run_command(f"cp -rf {tmp}/hpm_tools/. /usr/local/bin/", sudo=True)
+
+            self.log.info(f"安装 bmc_sdk 完成！")
+
     def run(self):
         self.built_type_check()
         self.prepare_conan()
@@ -103,3 +154,4 @@ class TaskClass(Task):
         self.run_signature_prepare()
         self.schema_valid()
         self.config.dump_manifest()
+        self.pre_download()

bmcgo/utils/build_conans.py

@@ -15,6 +15,7 @@ import subprocess
 import shlex
 import time
 import json
+import math
 import tempfile
 from queue import Queue
 from threading import Thread
@@ -185,9 +186,10 @@ class BuildConans(object):
                 if option not in options:
                     options += option
         tasks_cnt = 0
+        max_proc = max(int(math.sqrt(os.cpu_count())), 4)
         while True:
             for _, dep in dependencies.items():
-                if tasks_cnt >= 4:
+                if tasks_cnt >= max_proc:
                     break
                 # 如果是构建工具，不参与构建
                 if not dep.is_host:

bmcgo/utils/config.py

@@ -71,7 +71,7 @@ class Config:
 
     def __init__(self, bconfig: BmcgoConfig, board_name=misc.boardname_default(), target="target_personal"):
         self.bconfig = bconfig
-
+        self.manifest_sdk_flag = False
         # 单板名
         self.board_name = board_name
         # 构建目标的文件名，不包含py尾缀，文件存储在application/build/target目录
@@ -731,7 +731,9 @@ class Config:
             "product": f"{self.code_path}/product"
         }
         mani = self.load_manifest_yml(template=template)
-
+        sdk_flag = mani.get("base", {}).get("rtos_sdk", {})
+        if sdk_flag:
+            self.manifest_sdk_flag = True
         self.merge_platform_manifest(mani)
         self.complement_components(mani)
 
@@ -809,7 +811,19 @@ class Config:
         if os.path.isdir(self.temp_platform_build_dir):
             shutil.rmtree(self.temp_platform_build_dir)
         os.makedirs(os.path.join(self.code_path, "temp"), exist_ok=True)
+        mainfest_buildtools_file = os.path.realpath(os.path.join(
+            self.code_path, self.get_manufacture_config("base/dependency_buildtools")
+        ))
+        temp_buildtools_file = os.path.realpath(os.path.join(
+            self.temp_platform_build_dir, self.get_manufacture_config("base/dependency_buildtools")
+        ))
         tools.run_command(f"cp -rf {package_conan_dir} {self.temp_platform_build_dir}")
+        if self.manifest_sdk_flag:
+            if os.path.isfile(mainfest_buildtools_file):
+                tools.run_command(f"cp {mainfest_buildtools_file} {os.path.dirname(temp_buildtools_file)}")
+            else:
+                raise errors.BmcGoException("manifest.yaml中未配置base/dependency_buildtools，" +
+                "或在manifest代码仓下无法找到所配置的文件")
         self.copy_rtos_sdk(package_conan_dir)
         platform_manifest_path = os.path.join(
             self.temp_platform_build_dir, "manifest.yml"
@@ -822,6 +836,8 @@ class Config:
             rtos_sdk_dir = os.path.join(self.code_path, "rtos_sdk")
             rtos_sdk_src_dir = os.path.join(package_conan_dir, "rtos_sdk")
             if os.path.isdir(rtos_sdk_dir):
+                if self.manifest_sdk_flag:
+                    return
                 shutil.rmtree(rtos_sdk_dir)
             tools.run_command(f"cp -rf {rtos_sdk_src_dir} {rtos_sdk_dir}")
 

bmcgo/utils/tools.py

@@ -352,23 +352,6 @@ class Tools():
         else:
             os.makedirs(conan_bin)
 
-    @staticmethod
-    def download_file(url, file_path):
-        response = requests.get(url, stream=True)
-        response.raise_for_status()
-        total_size = int(response.headers.get("content-length", 0))
-
-        with open(file_path, 'wb') as f, tqdm(
-            total=total_size,
-            unit='B',
-            unit_scale=True,
-            desc=file_path,
-            miniters=1
-        ) as pbar:
-            for chunk in response.iter_content(chunk_size=8192):
-                f.write(chunk)
-                pbar.update(len(chunk))
-
     @staticmethod
     def get_hi171x_module_symver_option(path: str):
         sha256 = Tools.sha256sum(path)
@@ -430,6 +413,31 @@ class Tools():
                 return True
         return False
 
+
+    def download_file(self, name, url, file_path, sha256):
+        if os.path.isfile(file_path):
+            curr_pkg_sha256 = self.sha256sum(file_path)
+            if curr_pkg_sha256 == sha256:
+                self.log.info(f"已下载 {name}, 跳过.")
+                return
+        response = requests.get(url, stream=True)
+        response.raise_for_status()
+        total_size = int(response.headers.get("content-length", 0))
+
+        with open(file_path, 'wb') as f, tqdm(
+            total=total_size,
+            unit='B',
+            unit_scale=True,
+            desc=file_path,
+            miniters=1
+        ) as pbar:
+            for chunk in response.iter_content(chunk_size=8192):
+                f.write(chunk)
+                pbar.update(len(chunk))
+        real_sha256 = self.sha256sum(file_path)
+        if sha256 != real_sha256:
+            raise RuntimeError(f"下载文件 {url} 校验sha256失败，预期 {sha256}， 实际 {real_sha256}，请检查配置！")
+
     def install_platform_v2(self, platform_package, remote, update_conan_cache=False):
         name = platform_package.get(misc.CONAN)
         if misc.conan_v2():

{openubmc_bingo-0.6.33.dist-info → openubmc_bingo-0.6.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.33
+Version: 0.6.43
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.33.dist-info → openubmc_bingo-0.6.43.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=MSbDCURCHz9rQhhc2TNjfE-JFDxFzBia9RWAceY8b0Y,562
+bmcgo/__init__.py,sha256=BJa5lG5w1ONn8K63XashMcH9wCq2YZOssQ7u8IX48_A,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -7,7 +7,7 @@ bmcgo/logger.py,sha256=rcMqJnyQ5Ag3k04KLEskrG8ZJ508OOU_JH4fMFiGOqQ,6644
 bmcgo/misc.py,sha256=w0vzsD7uzrsxTly5Y1viLgYTKHhLP4sxa499XwbqHnU,6986
 bmcgo/worker.py,sha256=OXz5Gam3pmZjgQeoGJrYy73ZrQszCOxk9X19nbeBI_A,15710
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=kd1Bncj5eI77YDmptd4oENzGcXyqfszi0YLqvheGCWo,27808
+bmcgo/cli/cli.py,sha256=cPkTL0xwikjcfkT4UGQqNz9EUFkzli1_O2SwbYO2hgs,27859
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -90,7 +90,7 @@ bmcgo/codegen/lua/script/render_utils/ipmi_lua.py,sha256=jZ98qP_gJi6dAU40OmDr_J2
 bmcgo/codegen/lua/script/render_utils/ipmi_message_lua.py,sha256=Y-5pXMfAPDZqqoA9spkk80UHr63S6Z35gDeyAcu1tnc,1021
 bmcgo/codegen/lua/script/render_utils/mdb_lua.py,sha256=gKX_GUkIbYbbviBw9cEO3pfTwoLWurczYFmoOoWA1Us,6141
 bmcgo/codegen/lua/script/render_utils/message_lua.py,sha256=ZHJy35iJir1O149dafZnl-oEdU89-eP6VIeQmKjh9D8,1155
-bmcgo/codegen/lua/script/render_utils/messages_lua.py,sha256=eAe46JU1AJxfpifQCnioD1jxfDhfc-DLGRy8CmwCfBg,4948
+bmcgo/codegen/lua/script/render_utils/messages_lua.py,sha256=hFBLl3tqh7KIeljm0JEEyeDXkKSDxjtVMirc3euckyI,5189
 bmcgo/codegen/lua/script/render_utils/model_lua.py,sha256=kxlPkPboUKtUfK2HTWakmgKMFLLZ3UofPouWvng7UWY,18456
 bmcgo/codegen/lua/script/render_utils/old_model_lua.py,sha256=OFUPJOaiXDjXpknbh6Pw0TNC1dUVtjPbuIs-3fSN7p4,15611
 bmcgo/codegen/lua/script/render_utils/plugin_lua.py,sha256=-_r-MqjDNnoYel6zdsNSkqYI3w1DKJPwJy5Vsevl33s,1481
@@ -101,7 +101,7 @@ bmcgo/codegen/lua/script/render_utils/utils_message_lua.py,sha256=MPAwH4lZUF1JqZ
 bmcgo/codegen/lua/script/render_utils/validate_lua.py,sha256=NVjMWZwMxwUj9kdTaCRpyVZJkUQuR9kdzI7Y-MZDPaE,7079
 bmcgo/codegen/lua/templates/Makefile,sha256=-br3qnXM_73_nJhYVgF7TsNtVxt_p_h4l5TYPjWqQIs,4044
 bmcgo/codegen/lua/templates/errors.lua.mako,sha256=T93tESJl0K3r5izufq6NsqqCptQbVslpsTEjkQdDq0U,1536
-bmcgo/codegen/lua/templates/messages.lua.mako,sha256=GfWjgRy0is3d-U8-Wq-i_oWguFi5d1VHQKv0pJhV9cE,1074
+bmcgo/codegen/lua/templates/messages.lua.mako,sha256=tbvVXx-zodE5sqyKNW4-dzNmPpZ2yBKpkECsIf9-tkU,1115
 bmcgo/codegen/lua/templates/apps/Makefile,sha256=IPU-LW3i9xTQUrb9XCWYTWlATCTu2JE3aayL43juEeM,19484
 bmcgo/codegen/lua/templates/apps/Makefile.mdb.mk,sha256=Qmd-n_YsQbfnpED_6PIp_6pL13w6UCCGgBoBA4h6r_0,3296
 bmcgo/codegen/lua/templates/apps/app.lua.mako,sha256=Y_aZCPyNgeqfa39_RWxV-_m3out1p4vTTWnzqXtPV7E,276
@@ -173,13 +173,13 @@ bmcgo/component/component_dt_version_parse.py,sha256=-Rt6i2fZrmYNZGoMqB21D_T9fC7
 bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6oJLXcEA,7933
 bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,6544
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
-bmcgo/component/package_info.py,sha256=pEeRDfIeHYBt0SAqN_Arpv3d-S1XVB7Mn5Z0MNSRloU,14837
+bmcgo/component/package_info.py,sha256=pYgubJ-564JXQmEaSlYfGnoVgrNlY3O5jJP1vxZe-Qc,14844
 bmcgo/component/test.py,sha256=Kpg5fmcJ-F2lDlHsKTBXjhB00T-IOr5QWGfHsRXVgA0,45260
-bmcgo/component/analysis/analysis.py,sha256=VJpKdvQmlFQaeKWl3-JggsPq4ioObKOXuaBfzgd74hQ,8497
+bmcgo/component/analysis/analysis.py,sha256=flNkGn468I0wi6mAIuygyPK7eA5PWBw3Ks56B5rrhmc,9179
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
-bmcgo/component/analysis/data_deps.py,sha256=UkuqMhJseZIXMZWC2cJ4csko7rENPlpXJUU0eRWVZNM,16148
-bmcgo/component/analysis/dep-rules.json,sha256=OHAka6bWjl4l27jAOsv4IlnV-lmsCfp2Bcsuxxl0Qwo,34888
-bmcgo/component/analysis/dep_node.py,sha256=DSB30uim1Qrjs0zuphz0JXetP0ECBC7rzCElFNWQpwM,4598
+bmcgo/component/analysis/data_deps.py,sha256=lDCVZ1B56pOW3BApCroujEaak4I07tN9mDOWruhuDkc,16431
+bmcgo/component/analysis/dep-rules.json,sha256=Na1FoRkdcDpT5nlMR3EfdG-xFND4ghZk5Xr_g-fgynk,34995
+bmcgo/component/analysis/dep_node.py,sha256=i3BRg2iHRy-qv653--ckEJbl_sr-TdIhoEmGuTgZRBg,5168
 bmcgo/component/analysis/intf_deps.py,sha256=IlcPixdaBpXpb6U4M-I1hRRGHCg5SCUg07V6kAosacE,7382
 bmcgo/component/analysis/intf_validation.py,sha256=hAY9pB3_-2gkAyCE2aazW_twoAmlU3ePEg4oJHFgCh4,11422
 bmcgo/component/analysis/rule.py,sha256=xvntmvFdGa0J8WBlrHDdJ5bcl3jr4pXezR3KKvOg4Ag,7549
@@ -190,7 +190,7 @@ bmcgo/component/coverage/c_incremental_cov_report.template,sha256=FPhK1DZtmWsjDx
 bmcgo/component/coverage/incremental_cov.py,sha256=Uf-UdY4CW9rpP4sbURkCXBWyYMXWaG3R1Pyo3cDNvcQ,16859
 bmcgo/component/template/conanbase.py.mako,sha256=dNvbToMSYI7jod7maCpR0PBizvVoQHvXxglmN9LNflg,10984
 bmcgo/component/template/conanfile.deploy.py.mako,sha256=zpxluBjUFmJHfFrnBknxZ3cv3cxcqzJuGh2eN0uMXZA,889
-bmcgo/component/template_v2/conanbase.py.mako,sha256=TxqfYjhwKKjSARDJAIodSOWRhvUvsbOlw8nOjdO5QRo,15729
+bmcgo/component/template_v2/conanbase.py.mako,sha256=FA_oKwp3fVC2MsZLiTZWHVeLpLEGkoRYmqhWWZ7EQM4,15768
 bmcgo/component/template_v2/conanfile.deploy.py.mako,sha256=Xbd-PlfVHOWeRFLfvzINeykiZzzSHsgO_yUUvYrKqTw,512
 bmcgo/functional/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/functional/analysis.py,sha256=pXakxSojBH-dULngbmgMHR3bq9tphOaAN4euGKgEYoc,4016
@@ -205,7 +205,7 @@ bmcgo/functional/fetch.py,sha256=hkuHDKyrfbEhvnLbZ8-funhXTkSrCY27WFnYBJFRJMY,107
 bmcgo/functional/full_component.py,sha256=5lmb4tHVQ3d4RlWW5jQirMQ-F9p1YQP6SZL7Nf8PVHk,16799
 bmcgo/functional/git_history.py,sha256=JTuLhf7kNFoCSxFLAFVLRI4gPd_RBgTHKFgOCAFX2KE,9355
 bmcgo/functional/json_check.py,sha256=ACoABAV1YfrrR98-G_0sX5i5lFHRjl00GspmKRdUFz8,3473
-bmcgo/functional/maintain.py,sha256=6rnW6oD9Zynnn1qzrEZ-m9a6G02JEchqFv9KoTGRqEI,20401
+bmcgo/functional/maintain.py,sha256=lUn0BtMKMqYKm56aYhvuvnzj47p4BinwVCRuNZ2c1P0,18570
 bmcgo/functional/new.py,sha256=g7J4qLRTi4F9N6wlKHOVgJJwDmUFiWZbxO1PeGIWqTE,6171
 bmcgo/functional/schema_valid.py,sha256=WI7_NOJqU8wFC51bgiU9G7HJTYnxnMyzxH-L6jn339A,3924
 bmcgo/functional/simple_sign.py,sha256=AstEnGzcTIxAYs5U9G82JDXj7CnfhN9LyYcnkpGEH2Y,4086
@@ -223,36 +223,36 @@ bmcgo/target/publish.yml,sha256=WvaJAUZ0_6CMV3O1p1t6dagHe-DdLcXqLxKP11_ki1E,1615
 bmcgo/tasks/__init__.py,sha256=VapgzhPMmB7dzPIRohoVm1jjfVn_v97cYNCRmkxScaU,539
 bmcgo/tasks/download_buildtools_hm.py,sha256=f4UxStARc8Z8DnT_5O6ONajQ7P0sKyJ8brixr43fHVQ,5988
 bmcgo/tasks/misc.py,sha256=GK_bSDLGZW0FxywB2ICG1iIEz2y2QoCb1YQQk8SYOIA,711
-bmcgo/tasks/task.py,sha256=w8tdU5NwoUfVF4xKFvSzcCWCf0FGTBHJAToNLlP0p4w,18424
-bmcgo/tasks/task_build_conan.py,sha256=HNjEOuUN0uXN_myrhPP6d6BbxQqGnSVl9ZiJoZVdqA0,53024
-bmcgo/tasks/task_build_rootfs_img.py,sha256=JKEvldJnLWu2IdVSntuVowocQwdVtBQUpxzhplYauPI,29209
+bmcgo/tasks/task.py,sha256=95nKxTe5PW3rfhpm5YFasPtmP8oCraeWJKq0D5mbl6A,18578
+bmcgo/tasks/task_build_conan.py,sha256=5VXdm6kyuX93C-ZazDcQ2KCfJFnYRgkzLFJFSPs0OzU,53028
+bmcgo/tasks/task_build_rootfs_img.py,sha256=jRw-psICpACRspQOJ4e6zatG1a63V7yTpajnBmRL59E,28937
 bmcgo/tasks/task_build_wbd_up.py,sha256=X9-0Qqad-s3mGfJBMeBQvfZ99KlWcgaMluDr_zv6Z-o,3122
 bmcgo/tasks/task_buildgppbin.py,sha256=epBxxrYFPgoTzpBgPzSRXcUs-ia_BJWsLGflylEJS7I,6614
 bmcgo/tasks/task_buildhpm_ext4.py,sha256=DBZnmU_eb14J0CW_wVoCc9VKnssFF1vXmRhLJQ6kR28,3482
 bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2BaRQkH7KP3zwJ6FI,5393
-bmcgo/tasks/task_download_buildtools.py,sha256=1DXlVJdqc0SfRofeHx4f3Z9UjLu5hwUAP1UZxxbSxAM,7553
+bmcgo/tasks/task_download_buildtools.py,sha256=QZpsrm2eaoJ0z5PkdSuHXg1n7L9qPz2s3XAVCnQi-hA,4292
 bmcgo/tasks/task_download_dependency.py,sha256=2AW4awv_njlTrKy11ygKWekFBXLyS18FLcws8cVXGz0,3169
 bmcgo/tasks/task_hpm_envir_prepare.py,sha256=Jkt5tu04NUpSuiKG1Iaei8fUloWYhwHwdXehj4PLwMA,4244
 bmcgo/tasks/task_packet_to_supporte.py,sha256=eaNtri3YQfXFBnceM1-2C_6AgMgrGxEj4xKXTgNRPH8,4100
-bmcgo/tasks/task_prepare.py,sha256=vKHb5QPbIx0lHOGpcDjeAB7rMfERqMUCad2EzxLauBw,4534
+bmcgo/tasks/task_prepare.py,sha256=K1cb_3lhclRkCYa2wgp5E2FMOd3pC7VHBnm_4L_nrRE,6704
 bmcgo/tasks/task_sign_and_pack_hpm.py,sha256=X8m1WAj3c0bKi2JAaumR81Qxv1FnFi0SrRL-l6vDRAo,1965
 bmcgo/tasks/conan/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/tasks/conan/conanfile.py,sha256=MI6c2QNKixrkA5Tx4i9EKw7bZ20GVDIKgkaMwNHQKcg,1342
 bmcgo/utils/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/basic_enums.py,sha256=L5VtHtzSvs6duAnphgqDGXX80Wit3Y7DjMlpi9MCxyI,1348
 bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
-bmcgo/utils/build_conans.py,sha256=27aPzS7Q6e6xNlK9pkGgqJBe_pIs8YJHJXxqbaPoCN8,8920
+bmcgo/utils/build_conans.py,sha256=3afY0XOwFtfcKud2yp6nODIuPoMKjjsoAl5AV8GbJ6w,8997
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
-bmcgo/utils/config.py,sha256=xCljGFk7m8IVsCSchJDAzollZEZyXoMDLIgqRMepL-I,49952
+bmcgo/utils/config.py,sha256=RMrZV39x6q445LdCDnCM1CIoslrIy9FGN4Kp6uV3VRM,50915
 bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
 bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
 bmcgo/utils/mapping_config_patch.py,sha256=_gKfZnrvsLPgHn1yXhEJRVTAeuGpeGD9T-Pqyw5Ydys,16827
 bmcgo/utils/merge_csr.py,sha256=JNxHCfW1au84WQshdz0aQy8wMTEOHonjQT3s6LjlZN4,4580
 bmcgo/utils/perf_analysis.py,sha256=fh6lV9AAKVhpPkGPwAJ8EWfGfUoHjqGYQxrvc32Xiac,4767
-bmcgo/utils/tools.py,sha256=Ad6TwJ2iEx3isWlGdlZzsZAKjVrBOj_dnbPmeJfICHY,32572
+bmcgo/utils/tools.py,sha256=xJFmhIQdC2IjqMbVgjcjWOYJk3TwWG0EjN0-FQ4LJ4s,33012
 bmcgo/utils/installations/README.md,sha256=hKXnFYmeHEuROFMFE-vzlGLSHg71bei5ZYwyYZphWNk,2
 bmcgo/utils/installations/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/installations/base_installer.py,sha256=3UZiKWoa41ygRbLD3QsE2FTp-VFp79V0I53QLRIf4E8,5902
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.33.dist-info/METADATA,sha256=KnHh344kR5Wqxi49MJEY9C92awC_X6JS6kWLx8wYpL4,1010
-openubmc_bingo-0.6.33.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.33.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.33.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.33.dist-info/RECORD,,
+openubmc_bingo-0.6.43.dist-info/METADATA,sha256=i8-bjBQtmM-9IHzXefAEDynKZYHKk4Cog334a6pvmkE,1010
+openubmc_bingo-0.6.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.43.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.43.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.43.dist-info/RECORD,,