openubmc-bingo 0.6.63__py3-none-any.whl → 0.6.66__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.63'
+__version__ = '0.6.66'

bmcgo/functional/bmc_studio_action.py

@@ -34,16 +34,10 @@ def if_available(bconfig: BmcgoConfig):
     return True
 
 
-class BmcgoCommand(object):
+class BmcgoCommand():
     def __init__(self, bconfig: BmcgoConfig, *args):
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog="bmc studio", description="启动停止bmc studio", add_help=True,
-                                        formatter_class=argparse.RawTextHelpFormatter)
-        action_group = parser.add_mutually_exclusive_group()
-        action_group.add_argument("-start", action=ACTION_TRUE, help="bmc studio的启动操作")
-        action_group.add_argument("-stop", action=ACTION_TRUE, help="bmc studio的停止操作")
-        action_group.add_argument("-restart", action=ACTION_TRUE, help="bmc studio的重启操作")
-        parser.add_argument("-b", "--backend", help="指定bmc studio是前端运行还是后端运行，默认前端运行", action=ACTION_TRUE)
+        parser = self._create_parser()
         parsed_args, _ = parser.parse_known_args(*args)
         self.action = self.get_action(parsed_args)
         self.backend = parsed_args.backend
@@ -54,7 +48,8 @@ class BmcgoCommand(object):
             self.studio_script = f"{self.studio_path}/bmc_studio.sh"
             self.studio_command = f"{self.studio_script} {self.action}"
 
-    def get_action(self, parsed_args):
+    @staticmethod
+    def get_action(parsed_args):
         if parsed_args.stop:
             return "stop"
         elif parsed_args.restart:
@@ -84,7 +79,7 @@ class BmcgoCommand(object):
 
     def run_start(self):
         if not self.backend:
-            tools.run_command(self.studio_command, command_echo=False, show_log=True, timeout=None)
+            self._run_front_end()
             return
 
         self.studio_command = f"{self.studio_command} backend"
@@ -96,3 +91,19 @@ class BmcgoCommand(object):
             return
 
         log.warning(start_out)
+
+    def _run_front_end(self):
+        self.studio_command = f"trap ':' INT; /bin/bash {self.studio_command}; :"
+        command_list = ['/bin/bash', '-c', self.studio_command]
+        tools.run_command(command_list, command_echo=False, show_log=True, timeout=None)
+
+    def _create_parser(self):
+        _ = self
+        parser = argparse.ArgumentParser(prog="bmc studio", description="启动停止bmc studio", add_help=True,
+                                        formatter_class=argparse.RawTextHelpFormatter)
+        action_group = parser.add_mutually_exclusive_group()
+        action_group.add_argument("-start", action=ACTION_TRUE, help="bmc studio的启动操作")
+        action_group.add_argument("-stop", action=ACTION_TRUE, help="bmc studio的停止操作")
+        action_group.add_argument("-restart", action=ACTION_TRUE, help="bmc studio的重启操作")
+        parser.add_argument("-b", "--backend", help="指定bmc studio是前端运行还是后端运行，默认前端运行", action=ACTION_TRUE)
+        return parser

bmcgo/functional/check.py

@@ -49,7 +49,6 @@ _PACKAGE_INFO_HELP = """
     b. 文本格式
         package/version@user/channel
 """
-MODEL_CHOICES = ["all", "mds", "resource_tree", "csr", "interface_mapping"]
 
 
 def if_available(bconfig: BmcgoConfig):
@@ -57,34 +56,21 @@ def if_available(bconfig: BmcgoConfig):
 
 
 class BmcgoCommand:
+    MODEL_CHOICES = ["all", "mds", "resource_tree", "csr", "interface_mapping"]
+    BOARD_NAME_DEFAULT = misc.boardname_default()
+
     def __init__(self, bconfig: BmcgoConfig, *args):
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} check", description="语法正确性与模型一致性检查", add_help=True,
-            formatter_class=argparse.RawTextHelpFormatter)
-        parser.add_argument("-b", "--board_name",
-                            help="指定单板获取配套全量源码，可选值为build/product目录下的单板名\n默认：" + misc.boardname_default(),
-                            default=misc.boardname_default())
-        parser.add_argument("--stage", help="包类型，可选值为：rc(预发布包), stable(发布包)\n默认: stable", default="stable")
-        parser.add_argument("-r", "--remote")
-        parser.add_argument("-m", "--model", help=f"检查的模型，可选值为: {', '.join(MODEL_CHOICES)}\n默认: all",
-                            choices=MODEL_CHOICES, default="all")
+
+        parser = self._create_parser()
         parsed_args, _ = parser.parse_known_args(*args)
-        self.board_name = parsed_args.board_name
-        self.stage = parsed_args.stage
-        self.remote = parsed_args.remote
-        self.model = parsed_args.model
-        self.community_issues = set()
-        self.service_dict = {}
-        self.packages = {}
-        self.repo_brance = Repo(cwd).active_branch.name
-        self.repo_name = "manifest"
-        self.disabled = False
-        self.studio_dir = "/usr/share/bmc_studio/server"
-        self.studio_path = "/usr/share/bmc_studio/server/bmcstudio"
+        self._init_common_attributes(parsed_args)
+        self._init_specific_attributes(parsed_args)
+
         # 初始化fetch命令对象
         if self.bconfig.manifest:
             self.fetch_agent = FetchAgent(self.bconfig, *args)
-    
+
     @staticmethod
     def check_overdue(issue: dict):
         data = issue.get("deadline")
@@ -97,7 +83,7 @@ class BmcgoCommand:
         except Exception as e:
             log.warning("日期 %s 解析失败：%s", data, e)
             return False
-    
+
     @staticmethod
     def process_issues_group(issues, prefix, add_message=""):
         result = ""
@@ -111,9 +97,8 @@ class BmcgoCommand:
             if add_message:
                 result = f"{result}\n{add_message}\n"
         return result
-    
-    @staticmethod
-    def filter_output():
+
+    def filter_output(self):
         output_path = os.path.join(os.environ["HOME"], "bmc_studio", "var", "data", "cli_data", "issues.json")
         try:
             with open(output_path, "r") as output_fp:
@@ -124,6 +109,8 @@ class BmcgoCommand:
         ci_enabled_issues = []
         disabled_issues = []
         for item in items:
+            if not self._filter_issue(item):
+                continue
             rule = item.get("rule")
             filepath = item.get("filepath")
             ci_enabled = item.get("ciEnabled")
@@ -153,30 +140,23 @@ class BmcgoCommand:
             self.packages[comp_name] = package
 
     def run(self):
-        service_path = os.path.join(cwd, "mds", "service.json")
-        if self.bconfig.manifest is None:
-            if not os.path.isfile(service_path):
-                raise RuntimeError("mds/service.json 文件不存在")
-            with open(service_path, "r") as service_fp:
-                self.service_dict = json.load(service_fp)
-            if "name" not in self.service_dict:
-                raise RuntimeError("mds/service.json 文件中缺少 name 配置")
-            self.repo_name = self.service_dict.get("name")
-            self.find_component_packages()
+        self._check_repo_config()
+        self._before_run()
+
         if self.disabled:
             log.info("%s 仓库没有开启语法正确性和模型一致性检查", self.repo_name)
             return 0
+
         with tempfile.TemporaryDirectory(prefix="dependencies_repo_") as tempdir:
             if self.bconfig.manifest:
                 self.fetch_agent.code_path = tempdir
                 self.fetch_agent.run()
             elif self.packages:
                 FetchComponentCode(self.packages, tempdir, self.remote, include_open_source=False).run()
-            cmd = [self.studio_path, "check", "--repo", cwd, "--dependencies", tempdir, "--model", self.model]
-            if self.bconfig.manifest:
-                cmd.append("--manifest")
-                cmd.append("true")
+            cmd = self._get_studio_command(tempdir)
+
             os.chdir(self.studio_dir)
+            os.environ['LD_LIBRARY_PATH'] = '/usr/share/bmc_studio/server:$LD_LIBRARY_PATH'
             Helper.run(cmd, stdout=subprocess.DEVNULL)
             os.chdir(cwd)
         error, warning = self.filter_output()
@@ -186,4 +166,64 @@ class BmcgoCommand:
             return -1
         log.warning(warning)
         log.success("语法正确性和模型一致性检查通过\n")
-        return 0
+        return 0
+
+    def _init_common_attributes(self, parsed_args):
+        self.board_name = parsed_args.board_name
+        self.stage = parsed_args.stage
+        self.remote = parsed_args.remote
+        self.model = parsed_args.model
+        self.community_issues = set()
+        self.service_dict = {}
+        self.packages = {}
+        self.repo_branch = Repo(cwd).active_branch.name
+        self.repo_name = "manifest"
+        self.disabled = False
+        self.studio_dir = "/usr/share/bmc_studio/server"
+        self.studio_path = "/usr/share/bmc_studio/server/bmcstudio"
+
+    def _init_specific_attributes(self, parsed_args):
+        """初始化子类特有属性，由子类自行实现"""
+        pass
+
+    def _check_repo_config(self):
+        service_path = os.path.join(cwd, "mds", "service.json")
+        if self.bconfig.manifest is None:
+            if not os.path.isfile(service_path):
+                raise RuntimeError("mds/service.json 文件不存在")
+            with open(service_path, "r") as service_fp:
+                self.service_dict = json.load(service_fp)
+            if "name" not in self.service_dict:
+                raise RuntimeError("mds/service.json 文件中缺少 name 配置")
+            self.repo_name = self.service_dict.get("name")
+            self.find_component_packages()
+
+
+    def _get_studio_command(self, tempdir: str):
+        cmd = [self.studio_path, "check", "--repo", cwd, "--dependencies", tempdir, "--model", self.model]
+        if self.bconfig.manifest:
+            cmd.extend(["--manifest", "true"])
+            cmd.extend(["--board", self.board_name])
+        return cmd
+
+    def _filter_issue(self, item):
+        """过滤，由子类实现"""
+        _ = self
+        return True
+
+    def _before_run(self):
+        """主流程中的钩子函数, 由子类实现"""
+        pass
+
+    def _create_parser(self):
+        """命令参数，子类可重写"""
+        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} check", description="语法正确性与模型一致性检查", add_help=True,
+            formatter_class=argparse.RawTextHelpFormatter)
+        parser.add_argument("-b", "--board_name",
+                            help="指定单板获取配套全量源码，可选值为build/product目录下的单板名\n默认：" + self.BOARD_NAME_DEFAULT,
+                            default=self.BOARD_NAME_DEFAULT)
+        parser.add_argument("--stage", help="包类型，可选值为：rc(预发布包), stable(发布包)\n默认: stable", default="stable")
+        parser.add_argument("-r", "--remote")
+        parser.add_argument("-m", "--model", help=f"检查的模型，可选值为: {', '.join(self.MODEL_CHOICES)}\n默认: all",
+                            choices=self.MODEL_CHOICES, default="all")
+        return parser

bmcgo/tasks/task_download_buildtools.py

@@ -37,10 +37,10 @@ class DownloadDefaultBuildtools(Task):
         if self.config.partner_mode:
             self.info(f"从缓存目录{partner_tools_dir}复制编译器工具")
             self.run_command(f"cp -rf {partner_tools_dir}/. {self.rtos_sdk_dir}")
+        self.info("下载依赖工具结束")
 
-    def install_buildtools(self):
+    def install_rtos(self):
         is_ubuntu = self.tools.is_ubuntu
-        self.chdir(self.rtos_sdk_dir)
         self.info("删除目录 /opt/RTOS")
         self.run_command(f"rm -rf {BUILD_TOOLS_SHA256_PATH}", sudo=True)
         self.run_command("rm -rf /opt/RTOS", sudo=True)
@@ -54,36 +54,45 @@ class DownloadDefaultBuildtools(Task):
             else:
                 self.pipe_command(["rpm2cpio {}".format(rpm), "sudo cpio -id -D /"])
 
+    def install_hcc(self):
         self.info("删除目录 /opt/hcc_arm64le")
         self.run_command("rm -rf /opt/hcc_arm64le", sudo=True)
         self.info("解压 hcc_arm64le")
         self.run_command("tar -xzf hcc_arm64le.tar.gz -C /opt", sudo=True)
 
+    def setup_path(self):
         logname = os.getenv(misc.ENV_LOGNAME, None)
         if logname and logname != "root":
             user_group = f"{os.getuid():{os.getgid()}}"
             self.run_command(f"chown {user_group} /opt/hcc_arm64le -R", sudo=True)
             self.run_command(f"chown {user_group} /opt/RTOS -R", sudo=True)
-        self.chdir(self.config.code_path)
 
+    def copy_sysroot_sdk(self):
         libstdcpp_install_path = f"{self.config.sysroot}/usr/"
         os.makedirs(libstdcpp_install_path, exist_ok=True)
         self.run_command(f"cp -rf {self.config.cross_compile_install_path}/{self.config.cross_prefix}/lib64/" +
                          f" {libstdcpp_install_path}")
+
+    def install_buildtools(self):
+        # 检查rtos是否安装，未安装或版本不匹配时安装
+        self.skip_install = not self.check_need_install(self.rtos_sdk_dir, BUILD_TOOLS_SHA256_PATH,
+                                                        self.buildtools_new_sha256)
+        if self.skip_install:
+            self.info("buildtools版本匹配，跳过安装")
+            return
+        self.chdir(self.rtos_sdk_dir)
+        self.install_rtos()
+        self.install_hcc()
+        self.setup_path()
+        self.chdir(self.config.code_path)
+        self.copy_sysroot_sdk()
         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 run(self):
         self.download_tools()
-        self.info("下载依赖工具结束")
 
     def install(self):
-        self.skip_install = not self.check_need_install(self.rtos_sdk_dir, BUILD_TOOLS_SHA256_PATH,
-                                                        self.buildtools_new_sha256)
-        if self.skip_install:
-            self.info("buildtools版本匹配，跳过安装")
-            return
-        # 检查rtos是否安装，未安装或版本不匹配时安装
         self.install_buildtools()
 
 
@@ -96,4 +105,4 @@ class TaskClass(Task):
         self.download_buildtools.run()
 
     def install(self):
-        self.download_buildtools.install()
+        self.download_buildtools.install()

bmcgo/tasks/task_download_dependency.py

@@ -16,7 +16,6 @@
 修改记录：2021-10-11 创建
 '''
 import os
-import re
 import shutil
 
 from bmcgo.tasks.task import Task
@@ -32,42 +31,52 @@ class TaskClass(Task):
         self.skip_install = False
 
     def download_dependency(self):
-        self.info('开始下载依赖组件 ...')
+        self.info("开始下载sdk ...")
+        self.info(f"移除本地目录{self.sdk_dir}")
+        self.run_command(f"rm -rf {self.sdk_dir}", sudo=True)
         partner_sdk_dir = f"{os.path.expanduser('~')}/sdk"
         self.info(f"从缓存目录{partner_sdk_dir}复制sdk和rtos二进制文件")
         self.run_command(f"cp -rf {partner_sdk_dir}/. {self.sdk_dir}")
+        self.info("下载sdk结束")
 
-    def move_dependency(self):
-        # 移动到tools/build_tools目录中
+    def prepare_dependency(self):
+        # 移动到构建目录中
         if os.path.isdir(self.config.sdk_path):
             shutil.rmtree(self.config.sdk_path)
         self.run_command(f"cp -rf {self.sdk_dir} {self.config.sdk_path}")
-        self.info("移动依赖组件结束")
-        self.chdir(self.config.sdk_path)
-        for file in os.listdir("."):
-            if re.match("^Hi1711_[0-9]{8}_[0-9a-f]{40}.tar.gz$", file) is None:
-                continue
-            self.run_command(f"tar -xvf {file}")
-            break
-        if self.skip_install:
-            self.info("sdk版本匹配")
-            return
-        old_sdk_dir = "/opt/hi1711sdk"
+        self.info("移动sdk结束")
+
+    def clear_path(self, old_sdk_path):
         self.run_command(f"rm -rf {SDK_SHA256_PATH}", sudo=True)
         self.run_command(f"rm -rf {SDK_PATH}", sudo=True)
-        self.run_command(f"rm -rf {old_sdk_dir}", sudo=True)
+        self.run_command(f"rm -rf {old_sdk_path}", sudo=True)
+
+    def unzip_sdk(self):
+        self.info("开始解压sdk ...")
         self.run_command(f"mkdir -p {SDK_PATH}", ignore_error=True, sudo=True)
         self.run_command(f"tar -xzf hi1711sdk.tar.gz -C {SDK_PATH} {MODULE_SYMVERS}", sudo=True)
+
+    def setup_path(self, old_sdk_path):
         logname = os.getenv(misc.ENV_LOGNAME, None)
         if logname and logname != "root":
             user_group = f"{os.getuid():{os.getgid()}}"
             self.run_command(f"chown {user_group} {SDK_PATH} -R", sudo=True)
-        self.run_command(f"ln -s {SDK_PATH} {old_sdk_dir}", sudo=True)
+        self.run_command(f"ln -s {SDK_PATH} {old_sdk_path}", sudo=True)
         self.run_command("cp -af {} {}".format(self.sdk_new_sha256, SDK_SHA256_PATH), sudo=True)
         self.run_command("chmod a+r {}".format(SDK_SHA256_PATH), sudo=True)
 
+    def install_dependency(self):
+        self.chdir(self.config.sdk_path)
+        self.skip_install = not self.check_need_install(self.sdk_dir, SDK_SHA256_PATH, self.sdk_new_sha256)
+        if self.skip_install:
+            self.info("sdk版本匹配，跳过安装")
+            return
+        old_sdk_dir = "/opt/hi1711sdk"
+        self.clear_path(old_sdk_dir)
+        self.unzip_sdk()
+        self.setup_path(old_sdk_dir)
+
     def run(self):
         self.download_dependency()
-        self.info('下载依赖组件结束')
-        self.skip_install = not self.check_need_install(self.sdk_dir, SDK_SHA256_PATH, self.sdk_new_sha256)
-        self.move_dependency()
+        self.prepare_dependency()
+        self.install_dependency()

bmcgo/utils/fetch_component_code.py

@@ -10,6 +10,7 @@
 # EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
+import json
 import os
 import re
 import shutil
@@ -17,7 +18,7 @@ import subprocess
 from multiprocessing import Pool
 import patch_ng
 import yaml
-from git import Repo
+from git import Repo, exc
 
 from bmcgo import errors
 from bmcgo import misc
@@ -248,6 +249,21 @@ class FetchComponentCode:
                 log.error("conandata(%s) 没有找到", conandata)
             log.info("更新组件 %s 代码到 %s 失败, 无法获取到 conan 信息", component_name,
                      conan_version)
+        except exc.GitCommandError as exp:
+            # 尝试修补MDS
+            cmd = f"conan install --requires={conan_version} -r openubmc_dev \
+                --build=missing -pr profile.ini --format=json --output-folder=tmp"
+            result = json.loads(Tools().run_command(cmd, capture_output=True, ignore_error=True))
+            nodes = result.stdout.strip().get("graph").get("nodes")
+            for node in nodes.values():
+                if node.get("ref").startswith(conan_version):
+                    package_folder = node.get("package_folder")
+                    if os.path.exists(f"{package_folder}/include/mds"):
+                        src = f"{package_folder}/include/mds"
+                        dest = os.path.abspath(f"{component_name}/mds")
+                        shutil.copytree(src, dest, dirs_exist_ok=True)
+                        log.info("将组件 %s 复制到 %s.", component_name, f"{component_name}/mds")            
+            shutil.rmtree(f"{self.target_dir}/tmp", ignore_errors=True)
         except Exception as exp:
             log.error("工作状态错误: %s", exp)
-            log.error("更新组件代码到 %s 失败", conan_version)
+            log.error("更新组件代码到 %s 失败", conan_version)

{openubmc_bingo-0.6.63.dist-info → openubmc_bingo-0.6.66.dist-info}/METADATA

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

{openubmc_bingo-0.6.63.dist-info → openubmc_bingo-0.6.66.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=43ixOvkIh39o4ZhQabt-Iqd-IW0mIERU1M3-k75tKt8,562
+bmcgo/__init__.py,sha256=35RGOj62SFVkQy27ERD5AR3h542oaBYQIVkYOOwLpfQ,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -194,8 +194,8 @@ bmcgo/component/template_v2/conanbase.py.mako,sha256=H0yO-uijpENtujj_1u037U2mZyy
 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=4FaJlz7CbupHAdCdhdrRZCTlnHZ0bz7Cy32FNg9Ik_0,4097
-bmcgo/functional/bmc_studio_action.py,sha256=Gg96UB8QtnhsaqSdMhXuS9fddzAFPhR6UYCpto9UOYA,3605
-bmcgo/functional/check.py,sha256=ReGN_8RRM6isX_r7XXEuHzkooh8pasky5_GpAml5d_g,8356
+bmcgo/functional/bmc_studio_action.py,sha256=1-O44mp--_r6M971cZ5JgutcQMM8aQtfQgDsSRXSrX8,3920
+bmcgo/functional/check.py,sha256=lW9RAEhgo0CTrZW1iB6cetQBg_S_vtqtUchUqEy3JSU,9432
 bmcgo/functional/conan_index_build.py,sha256=Mp1fDpZVvecn5lUCsWZqq3mKSx9yu5pznQrDZr4Liuk,13443
 bmcgo/functional/config.py,sha256=ZQ-a9hegI0cV41iTo7t49ryBeUH4wPJ-qkVvWp8toV4,10824
 bmcgo/functional/csr_build.py,sha256=k6vEWuhrmTXTndMQX-RF6v9S7So-Gi4WWjoUYzh5IVA,42046
@@ -221,7 +221,6 @@ bmcgo/target/install_sdk.yml,sha256=PjSSFtDudnlA_N-__XHHuJmYTZT0ZcTKlyzOz9xIK3I,
 bmcgo/target/personal.yml,sha256=o2PEQIcHe7v8J5-WHiQlgTEgiisQx_vCkgLlKDLkzh4,1953
 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=95nKxTe5PW3rfhpm5YFasPtmP8oCraeWJKq0D5mbl6A,18578
 bmcgo/tasks/task_build_conan.py,sha256=Si-8fIrQ_Vva6gw0kdLApEZY5cKt8Mt1C_8Ef4If61I,53872
@@ -230,8 +229,8 @@ bmcgo/tasks/task_build_wbd_up.py,sha256=X9-0Qqad-s3mGfJBMeBQvfZ99KlWcgaMluDr_zv6
 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=QZpsrm2eaoJ0z5PkdSuHXg1n7L9qPz2s3XAVCnQi-hA,4292
-bmcgo/tasks/task_download_dependency.py,sha256=2AW4awv_njlTrKy11ygKWekFBXLyS18FLcws8cVXGz0,3169
+bmcgo/tasks/task_download_buildtools.py,sha256=imiOIWXxKOiWolALasTuSp3EkXrVeFWD0bPLERA78W0,4520
+bmcgo/tasks/task_download_dependency.py,sha256=-ZkRcUKZyx3KYWlbBEOoJEm9rpfDGIItnJZQqpimNDM,3369
 bmcgo/tasks/task_hpm_envir_prepare.py,sha256=KVxiYeLtONpWe6Sh2l7hj09HD3NydrSTx3ycrpT6gLg,3457
 bmcgo/tasks/task_packet_to_supporte.py,sha256=5VSnC9typxiShCxt8YWWyBVojJ6MaXvgPHiIf6bObuA,4351
 bmcgo/tasks/task_prepare.py,sha256=K1cb_3lhclRkCYa2wgp5E2FMOd3pC7VHBnm_4L_nrRE,6704
@@ -246,7 +245,7 @@ bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPP
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=ukc-H-A4ljkOShzVtkYWL0oTIYwxgDIZtP-fPqqHnRY,6274
 bmcgo/utils/config.py,sha256=BoNx8U8VjnHrC-lFXIhp6Ex8f02kZgUS-mTkRxi_SYM,51141
-bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
+bmcgo/utils/fetch_component_code.py,sha256=gLgo3J3s5DyuoKXuOArjxfQZxvCCt_bOWbI6teH5CNQ,12328
 bmcgo/utils/install_manager.py,sha256=Ag7tcTbhBfc6aTe5FOiET-8koq8_iY38Sozmi3dquio,4919
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
 bmcgo/utils/mapping_config_patch.py,sha256=rfCfeiEU3WAEMDuUxLDARNjne3pWtK0Bxga3dQrEWoM,16827
@@ -264,8 +263,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=AEspVgsVAnmUdvqZYNCb7SPoUEq_0i61dfpauyguLa4,229
 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.63.dist-info/METADATA,sha256=Cu1hBuatPipUUr2RecPDKy_Q3yClsDgiN6LnVJJ9IjA,1010
-openubmc_bingo-0.6.63.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.63.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.63.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.63.dist-info/RECORD,,
+openubmc_bingo-0.6.66.dist-info/METADATA,sha256=c7qItr-Hvt0Fzra-Q2wtuEN77amPYsFx8gOnGG1tvtg,1010
+openubmc_bingo-0.6.66.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.66.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.66.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.66.dist-info/RECORD,,

bmcgo/tasks/download_buildtools_hm.py

@@ -1,124 +0,0 @@
-# Copyright (c) 2024 Huawei Technologies Co., Ltd.
-# openUBMC is licensed under Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#         http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-# See the Mulan PSL v2 for more details.
-"""
-功    能：下载并安装V2X的rtos/hcc工具
-修改记录：2024-08-29 创建
-"""
-import os
-import shutil
-
-from bmcgo.tasks.task import Task
-from bmcgo.utils.config import Config
-from bmcgo import misc
-
-
-class DownloadHmBuildTools(Task):
-    def __init__(self, config: Config):
-        super(DownloadHmBuildTools, self).__init__(config, "DownloadHmBuildTools")
-        self.dependency_file = os.path.realpath(
-            os.path.join(self.config.code_path, self.get_manufacture_config("base/dependency_buildtools"))
-        )
-        self.rtos_sdk_dir = f"{self.config.tools_path}/rtos-sdk-arm64-hm"
-        _, buildtool_config = self.get_profile_config()
-        self.standalone_toolchain = buildtool_config.get("standalone_toolchain", self.config.cross_compile_install_path)
-        self.sdkroot = buildtool_config.get("sdkroot", "/opt/hi1711sdk")
-        self.rtos_root = buildtool_config.get("rtos_root", f"/opt/{self.config.rtos_offering}")
-        self.sysroot = buildtool_config.get("sysroot", self.config.sysroot)
-        self.target_host = buildtool_config.get("target_host", self.config.cross_prefix)
-        self.dep_md5 = f"{self.rtos_root}/dependency.md5sum"
-        self.dep_md5_new = f"{self.tools.user_home}/dependency.md5sum.new"
-        self.skip_install = False
-
-    def download_tools(self):
-        self.info(f"移除下载路径: {self.rtos_sdk_dir}")
-        self.run_command(f"rm -rf {self.rtos_sdk_dir}", ignore_error=True, sudo=True)
-        self.info("开始下载依赖工具...")
-        partner_tools_dir = f"{os.path.expanduser('~')}/rtos_compiler"
-        if self.config.partner_mode:
-            self.info(f"从缓存目录{partner_tools_dir}复制编译器工具")
-            self.run_command(f"cp -rf {partner_tools_dir}/. {self.rtos_sdk_dir}")
-        self.info("下载依赖工具结束")
-
-    def check_rtos_sdk(self):
-        is_ubuntu = self.tools.is_ubuntu
-        self.chdir(self.rtos_sdk_dir)
-        self.info("安装 rpm 包")
-        self.info(f"删除目录 {self.rtos_root}")
-        self.run_command(f"rm -rf {self.rtos_root}", sudo=True)
-        for rpm in os.listdir("./"):
-            if not os.path.isfile(rpm) or not rpm.endswith(".rpm"):
-                continue
-            self.info("安装 {}".format(rpm))
-            if not is_ubuntu:
-                self.run_command("rpm -ivh {}".format(rpm), sudo=True)
-            else:
-                self.pipe_command(["rpm2cpio {}".format(rpm), "sudo cpio -id -D /"])
-
-        self.info(f"删除目录 {self.standalone_toolchain}")
-        self.run_command(f"rm -rf {self.standalone_toolchain}", sudo=True)
-        self.info("解压 hcc_arm64le")
-        self.run_command("tar -xzf hcc_arm64le.tar.gz -C /opt", sudo=True)
-
-        hm_tiny = "/opt/hcc_arm64le_hm_tiny"
-        self.info(f"删除目录 {hm_tiny}")
-        self.run_command(f"rm -rf {hm_tiny}", sudo=True)
-        self.info("解压 hcc_arm64le_hm_tiny")
-        self.run_command("tar -xzf hcc_arm64le_hm_tiny.tar.gz -C /opt", sudo=True)
-
-        self.info(f"删除目录 {self.sdkroot}")
-        self.run_command(f"rm -rf {self.sdkroot}", ignore_error=True, sudo=True)
-        self.run_command(f"mkdir -p {self.sdkroot}", ignore_error=True, sudo=True)
-        self.info("解压 hi1711sdk")
-        self.run_command(f"tar -xzf hi1711sdk.tar.gz -C {self.sdkroot} Module.symvers", sudo=True)
-        logname = os.getenv(misc.ENV_LOGNAME, None)
-        if logname and logname != "root":
-            self.run_command(f"chown {logname} {self.rtos_root} -R", sudo=True)
-            self.run_command(f"chown {logname} {self.sdkroot} -R", sudo=True)
-            self.run_command(f"chown {logname} {self.standalone_toolchain} -R", sudo=True)
-            self.run_command(f"chown {logname} {hm_tiny} -R", sudo=True)
-
-        self.chdir(self.config.code_path)
-
-        libstdcpp_install_path = os.path.join(self.sysroot, "usr")
-        os.makedirs(libstdcpp_install_path, exist_ok=True)
-
-        cross_compile_lib64 = os.path.join(self.standalone_toolchain, self.target_host, "lib64")
-        self.run_command(f"cp -rf {cross_compile_lib64} {libstdcpp_install_path}")
-
-        cmake_platform, _ = self.pipe_command(
-            ["find /usr/share -type d -wholename */Modules/Platform", "head -n 1"], sudo=True, capture_output=True
-        )
-        self.info(f"复制HongMeng.cmake到 {cmake_platform}")
-        hm_cmake = os.path.join(libstdcpp_install_path, "share/cmake/Modules/Platform/HongMeng.cmake")
-        self.run_command(f"cp -af {hm_cmake} {cmake_platform}", sudo=True)
-
-        self.run_command("cp -af {} {}".format(self.dep_md5_new, self.dep_md5))
-        # md5文件对齐其他分支
-        dep_md5_br = f"{self.tools.user_home}/dependency.md5sum"
-        self.run_command(f"cp -af {self.dep_md5_new} {dep_md5_br}")
-
-    def run(self):
-        self.pipe_command([f"md5sum {self.dependency_file}"], self.dep_md5_new)
-        if os.path.isfile(self.dep_md5):
-            with open(self.dep_md5, "r") as fp:
-                md5old = fp.read()
-            with open(self.dep_md5_new, "r") as fp:
-                md5new = fp.read()
-            if md5old == md5new:
-                self.info("版本匹配, 跳过安装")
-                self.skip_install = True
-                return
-        self.download_tools()
-
-    def install(self):
-        if self.skip_install:
-            return
-        # 检查rtos是否安装，未安装或版本不匹配时安装
-        self.check_rtos_sdk()