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

bmcgo/functional/check.py

@@ -155,8 +155,12 @@ class BmcgoCommand:
                 FetchComponentCode(self.packages, tempdir, self.remote, include_open_source=False).run()
             cmd = self._get_studio_command(tempdir)
 
+            # 额外加入仓颉runtime的依赖库
+            insert_path = '/usr/share/bmc_studio/server'
             os.chdir(self.studio_dir)
-            os.environ['LD_LIBRARY_PATH'] = '/usr/share/bmc_studio/server:$LD_LIBRARY_PATH'
+            cur_path = os.environ.get('LD_LIBRARY_PATH', '')
+            new_path = f"{insert_path}:{cur_path}"
+            os.environ['LD_LIBRARY_PATH'] = new_path
             Helper.run(cmd, stdout=subprocess.DEVNULL)
             os.chdir(cwd)
         error, warning = self.filter_output()

bmcgo/tasks/task_build_rootfs_img.py

@@ -21,6 +21,7 @@ import stat
 import time
 import subprocess
 import tempfile
+import re
 from multiprocessing import Process
 
 from git import Repo
@@ -32,19 +33,6 @@ from bmcgo.utils.mapping_config_patch import MappingConfigPatch
 from bmcgo import errors, misc
 
 
-class MakeZeroImageProcess(Process):
-    def __init__(self, work, bs_count, img_path):
-        super().__init__()
-        self.work = work
-        self.bs_count = bs_count
-        self.img_path = img_path
-
-    def run(self):
-        self.work.work_name = os.path.basename(self.img_path)
-        cmd = f"dd if=/dev/zero of={self.img_path} bs=4096 count={self.bs_count}"
-        self.work.run_command(cmd)
-
-
 class TaskClass(Task):
     def __init__(self, config: Config, work_name=""):
         super(TaskClass, self).__init__(config, work_name)
@@ -57,6 +45,38 @@ class TaskClass(Task):
         self.rootfs_img_path = f"{self.config.work_out}/rootfs_BMC.img"
         self.datafs_img_path = f"{self.config.hpm_build_dir}/datafs_{self.config.board_name}.img"
 
+    @staticmethod
+    def make_strip_cmd(file_list, relative_path, build_type=None):
+        base = ["sudo find {} -type f ".format(relative_path)]
+        base.append("grep -v \"/share/\"")
+        base.append("grep -v \".json$\"")
+        base.append("grep -v \"\.lua$\"")
+        base.append("grep -v \".sh$\"")
+        base.append("grep -v \".png$\"")
+        base.append("grep -v \".jpg$\"")
+        base.append("grep -v \".jpeg$\"")
+        base.append("grep -v \".html$\"")
+        base.append("grep -v \".js$\"")
+        base.append("grep -v \".css$\"")
+        base.append("grep -v \".svg$\"")
+        base.append("grep -v \".sr$\"")
+        base.append("grep -v \".conf$\"")
+        base.append("grep -v \".service$\"")
+        base.append("grep -v \".cfg$\"")
+        base.append("grep -v \".gif$\"")
+        base.append("grep -v \".ttf$\"")
+        base.append("grep -v \".target$\"")
+        if build_type == "debug":
+            # so库一般带有版本号，此处不能注明具体的版本号，否则可能导致版本变更时不能正确strip
+            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))
+        base.append("grep 'not stripped'")
+        base.append("awk -F: '{{print $1}}'")
+        base.append("grep -v '.ko$'")
+        return base
+
     def set_evn(self):
         self.buildimg_dir = self.config.buildimg_dir
         self.tools.check_path(self.buildimg_dir)
@@ -202,13 +222,37 @@ class TaskClass(Task):
         # 差异化处理完schema文件之后已完成schema整合，不在需要产品schema目录(强制删除时即使不存在也不会出错)
         self.run_command(f"rm -rf {product_schema_path}", sudo=True)
 
+    # 将默认接口配置复制到节点目录中
+    def copy_interface_config(self, config_path, custom_path):
+        for config_dir in os.listdir(config_path):
+            # redfish的schema文件仍放在原路径，不需要进行复制
+            if not re.match(r'^[a-fA-F0-9]{2}_[a-fA-F0-9]{2}$', config_dir) and \
+                config_dir != "static_resource" and config_dir != "config_patch":
+                source_path = os.path.join(config_path, config_dir)
+                copy_cmd = f"cp -r {source_path} {custom_path}/"
+                self.tools.run_command(copy_cmd, sudo=True)
+
+    # 支持产品层级多节点共包，每个节点有独立的定制化接口配置
+    def custom_mapping_config_patch(self, config_path):
+        for custom_item in os.listdir(config_path):
+            # 节点目录命名为xx_xx格式，以十六进制表示
+            if re.match(r'^[a-fA-F0-9]{2}_[a-fA-F0-9]{2}$', custom_item):
+                custom_path = os.path.join(config_path, custom_item)
+                self.copy_interface_config(config_path, custom_path)
+                patch_work = MappingConfigPatch(self.config, config_path=custom_path)
+                patch_work.run()
+
     # 支持映射配置文件根据产品差异进行打补丁
     def mapping_config_patch(self):
         self.info("开始根据配置映射打补丁")
         for item in ["redfish", "web_backend", misc.CLI, "snmp"]:
             config_path = os.path.join(self.rtos_rootfs, "opt/bmc/apps", item, "interface_config")
-            if not os.path.isdir(config_path):
+            ret = self.tools.run_command(f"test -d {config_path}", ignore_error=True, sudo=True)
+            if ret.returncode != 0:
                 continue
+
+            self.custom_mapping_config_patch(config_path)
+            # 各节点的配置打完补丁后再进行默认配置的打补丁操作
             patch_work = MappingConfigPatch(self.config, config_path=config_path)
             patch_work.run()
 
@@ -334,38 +378,19 @@ class TaskClass(Task):
         self.run_command(f"chmod {sr_dir_permission} {sr_dir}", sudo=True, command_echo=False)
         self.run_command(f"chmod 440 {csr_version_file_path}", sudo=True, command_echo=False)
 
-    def make_strip_cmd(self, file_list):
+    def strip(self):
+        # strip非ko文件
+        file_list = os.path.join(self.buildimg_dir, "no_striped.filelist")
         work_path = os.getcwd()
         relative_path = os.path.relpath(work_path, self.rtos_rootfs)
-        base = ["sudo find {} -type f ".format(relative_path)]
-        base.append("grep -v \"/share/\"")
-        base.append("grep -v \".json$\"")
-        base.append("grep -v \"\.lua$\"")
-        base.append("grep -v \".sh$\"")
-        base.append("grep -v \".png$\"")
-        base.append("grep -v \".jpg$\"")
-        base.append("grep -v \".jpeg$\"")
-        base.append("grep -v \".html$\"")
-        base.append("grep -v \".js$\"")
-        base.append("grep -v \".css$\"")
-        base.append("grep -v \".svg$\"")
-        base.append("grep -v \".sr$\"")
-        base.append("grep -v \".conf$\"")
-        base.append("grep -v \".service$\"")
-        base.append("grep -v \".cfg$\"")
-        base.append("grep -v \".gif$\"")
-        base.append("grep -v \".ttf$\"")
-        base.append("grep -v \".target$\"")
-        if self.config.build_type == "debug":
-            # so库一般带有版本号，此处不能注明具体的版本号，否则可能导致版本变更时不能正确strip
-            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))
-        base.append("grep 'not stripped'")
-        base.append("awk -F: '{{print $1}}'")
-        base.append("grep -v '.ko$'")
-        return base
+        base = self.make_strip_cmd(file_list, relative_path, self.config.build_type)
+        strip = os.path.join(self.config.cross_compile_install_path, "bin", self.config.strip)
+        self.pipe_command(base, file_list)
+        if os.path.isfile(file_list) and not self.config.enable_arm_gcov:
+            cmd = ["cat {}".format(file_list), "sudo xargs -P 0 -I {{}} {} -R .comment {{}}".format(strip)]
+            self.pipe_command(cmd)
+            cmd = ["cat {}".format(file_list), "sudo xargs -P 0 -I {{}} {} {{}}".format(strip)]
+            self.pipe_command(cmd)
 
     def build_common_fs(self):
         """
@@ -374,43 +399,22 @@ class TaskClass(Task):
         self.chdir(self.buildimg_dir)
         self.info("开始构建 rootfs ...")
 
-        rtos_tar = os.path.join(self.config.sdk_path, "rtos.tar.gz")
-        sdk_tar = os.path.join(self.config.sdk_path, "hi1711sdk.tar.gz")
-        # 解压SDK
-        self.run_command(f"rm -rf {self.rtos_rootfs}", sudo=True)
-        self.run_command(f"tar --xattrs --xattrs-include=* -xf {rtos_tar}", sudo=True)
-        self.run_command(f"sudo chown -R 0:0 {self.rtos_rootfs}", sudo=True)
-        self.info("拷贝RTOS提供的mke2fs.conf配置文件覆盖本地环境中的/etc/mke2fs.conf文件, 确保mkfs.ext4使用该配置文件")
-        self.run_command(f"cp -f {self.rtos_rootfs}/etc/mke2fs.conf /etc/mke2fs.conf", sudo=True)
-        self.run_command(f"rm -rf {self.rtos_rootfs}/etc/ssh", sudo=True)
-        self.run_command(f"rm -rf {self.rtos_rootfs}/usr/share/doc/openubmc", sudo=True)
+        self.make_rtos_rootfs()
 
         # 记录代码分支和提交节点
         self.create_bmc_release()
 
-        # 解压SDK并复制到指定位置
-        sdk_path = os.path.join(self.buildimg_dir, "sdk")
-        self.run_command(f"rm -rf {sdk_path}", sudo=True)
-        self.run_command(f"mkdir -p {sdk_path}", sudo=True)
-        self.run_command("tar -xf {} -C {}".format(sdk_tar, sdk_path), sudo=True)
-        ko_path = f"{self.rtos_rootfs}/lib/modules/"
-        self.run_command("cp -dfr {}/. {}".format(sdk_path, ko_path), sudo=True)
+        self.copy_ko_modules()
 
         self.chdir(self.config.work_out)
         self.copy_rtos_modules()
+        self.copy_upgrade_dat_file()
 
         for cus in self.customization:
             cus.rootfs_cust(self.rtos_rootfs)
-        # strip非ko文件
-        file_list = os.path.join(self.buildimg_dir, "no_striped.filelist")
-        base = self.make_strip_cmd(file_list)
-        strip = os.path.join(self.config.cross_compile_install_path, "bin", self.config.strip)
-        self.pipe_command(base, file_list)
-        if os.path.isfile(file_list) and not self.config.enable_arm_gcov:
-            cmd = ["cat {}".format(file_list), "sudo xargs -P 0 -I {{}} {} -R .comment {{}}".format(strip)]
-            self.pipe_command(cmd)
-            cmd = ["cat {}".format(file_list), "sudo xargs -P 0 -I {{}} {} {{}}".format(strip)]
-            self.pipe_command(cmd)
+
+        self.strip()
+
         # 删除.a文件
         cmd = ["sudo find {} -type f -name *.a".format(self.rtos_rootfs), "sudo xargs -P 0 -i{{}} rm {{}}"]
         self.pipe_command(cmd)
@@ -422,6 +426,18 @@ class TaskClass(Task):
             self.prepare_preloader_for_luacov()
             self.prepare_coverage_config()
 
+    def make_rtos_rootfs(self):
+        self.info("开始构建 rootfs ...")
+        rtos_tar = os.path.join(self.config.sdk_path, "rtos.tar.gz")
+        # 解压SDK
+        self.run_command(f"rm -rf {self.rtos_rootfs}", sudo=True)
+        self.run_command(f"tar --xattrs --xattrs-include=* -xf {rtos_tar}", sudo=True)
+        self.run_command(f"sudo chown -R 0:0 {self.rtos_rootfs}", sudo=True)
+        self.info("拷贝RTOS提供的mke2fs.conf配置文件覆盖本地环境中的/etc/mke2fs.conf文件, 确保mkfs.ext4使用该配置文件")
+        self.run_command(f"cp -f {self.rtos_rootfs}/etc/mke2fs.conf /etc/mke2fs.conf", sudo=True)
+        self.run_command(f"rm -rf {self.rtos_rootfs}/etc/ssh", sudo=True)
+        self.run_command(f"rm -rf {self.rtos_rootfs}/usr/share/doc/openubmc", sudo=True)
+
     def create_bmc_release(self):
         bmc_release_path = f"{self.rtos_rootfs}/etc/bmc-release"
         temp_bmc_release_file = tempfile.NamedTemporaryFile()
@@ -448,6 +464,16 @@ class TaskClass(Task):
         self.run_command(f"cp {temp_bmc_release_file.name} {bmc_release_path}", sudo=True, command_echo=False)
         self.run_command(f"chmod 644 {bmc_release_path}", sudo=True)
 
+    def copy_ko_modules(self):
+        # 解压SDK并复制到指定位置
+        sdk_tar = os.path.join(self.config.sdk_path, "hi1711sdk.tar.gz")
+        sdk_path = os.path.join(self.buildimg_dir, "sdk")
+        self.run_command(f"rm -rf {sdk_path}", sudo=True)
+        self.run_command(f"mkdir -p {sdk_path}", sudo=True)
+        self.run_command("tar -xf {} -C {}".format(sdk_tar, sdk_path), sudo=True)
+        ko_path = f"{self.rtos_rootfs}/lib/modules/"
+        self.run_command("cp -dfr {}/. {}".format(sdk_path, ko_path), sudo=True)
+
     def copy_rtos_modules(self):
         self.run_command("cp -af {}/. {}".format(self.config.rootfs_path, self.rtos_rootfs), sudo=True)
         cp_cmd = "cp -df {} {}"
@@ -455,14 +481,17 @@ class TaskClass(Task):
                                                f"{self.rtos_rootfs}/lib64/libgcc_s.so.1"), sudo=True)
         self.run_command(cp_cmd.format("/opt/hcc_arm64le/aarch64-target-linux-gnu/lib64/libstdc++.so.6",
                                                f"{self.rtos_rootfs}/lib64/libstdc++.so.6"), sudo=True)
+        self.run_command("chmod 755 {}".format(f"{self.rtos_rootfs}/lib64/libgcc_s.so.1"), sudo=True)
+        self.run_command("chmod 755 {}".format(f"{self.rtos_rootfs}/lib64/libstdc++.so.6"), sudo=True)
+
+    def copy_upgrade_dat_file(self):
+        cp_cmd = "cp -df {} {}"
         self.run_command("mkdir -p {}".format(f"{self.rtos_rootfs}/opt/pme/upgrade"), sudo=True)
         self.run_command(cp_cmd.format(f"{self.config.code_path}/manufacture/misc/pme_profile_en.dat",
                                                f"{self.rtos_rootfs}/opt/pme/upgrade/pme_profile_en"), sudo=True)
         self.run_command(cp_cmd.format(f"{self.config.code_path}/manufacture/misc/datatocheck_upgrade.dat",
                                                f"{self.rtos_rootfs}/opt/pme/upgrade/datatocheck_upgrade.dat"),
                                                sudo=True)
-        self.run_command("chmod 755 {}".format(f"{self.rtos_rootfs}/lib64/libgcc_s.so.1"), sudo=True)
-        self.run_command("chmod 755 {}".format(f"{self.rtos_rootfs}/lib64/libstdc++.so.6"), sudo=True)
         self.run_command("chmod 400 {}".format(f"{self.rtos_rootfs}/opt/pme/upgrade/pme_profile_en"), sudo=True)
         self.run_command("chmod 400 {}".format(f"{self.rtos_rootfs}/opt/pme/upgrade/datatocheck_upgrade.dat"),
                           sudo=True)
@@ -496,6 +525,20 @@ class TaskClass(Task):
         self.run_command(f"chown 0:0 {tar_path}", sudo=True)
         return
 
+    def rootfs_customization(self):
+        if self.config.build_type == 'debug':
+            for cus in self.customization:
+                cus.rootfs_debug_cust(self.mnt_datafs)
+        elif self.config.build_type == 'release':
+            for cus in self.customization:
+                cus.rootfs_release_cust(self.mnt_datafs)
+
+        for cus in self.customization:
+            cus.rootfs_common(self.mnt_datafs)
+
+    def make_img(self):
+        self.tools.make_img(self.rootfs_img_path, self.mnt_datafs, "376")
+
     def make_rootfs_img(self):
         self.make_datafs_img()
 
@@ -519,18 +562,11 @@ class TaskClass(Task):
 
         self.component_swbom()
         self.run_command(f"sudo cp -a {self.rtos_rootfs}/. {self.mnt_datafs}/")
-        if self.config.build_type == 'debug':
-            for cus in self.customization:
-                cus.rootfs_debug_cust(self.mnt_datafs)
-        elif self.config.build_type == 'release':
-            for cus in self.customization:
-                cus.rootfs_release_cust(self.mnt_datafs)
-
-        for cus in self.customization:
-            cus.rootfs_common(self.mnt_datafs)
+        self.rootfs_customization()
         self.chdir(self.config.work_out)
-        self.tools.make_img(self.rootfs_img_path, self.mnt_datafs, "376")
+        self.make_img()
 
+    def post_make_rootfs_img(self):
         self.run_command(f"zerofree -v {self.rootfs_img_path}")
         self.run_command(f"get_img_parma_area.sh {self.rootfs_img_path}")
 
@@ -568,3 +604,4 @@ class TaskClass(Task):
         self.set_evn()
         self.build_common_fs()
         self.make_rootfs_img()
+        self.post_make_rootfs_img()

bmcgo/tasks/task_buildgppbin.py

@@ -24,6 +24,10 @@ from bmcgo import misc
 
 
 class TaskClass(Task):
+    def __init__(self, config, work_name=""):
+        super(TaskClass, self).__init__(config, work_name=work_name)
+        self.suffix = "BMC"
+
     def copy_files(self):
         rootca = os.path.join(self.config.work_out, misc.ROOTCA_DER)
         crl = os.path.join(self.config.work_out, misc.CMS_CRL)
@@ -79,16 +83,17 @@ class TaskClass(Task):
         else:
             pmode_file = ""
 
+        self.write_gpp_bin(pmode_file)
 
+    def write_gpp_bin(self, pmode_file):
         self.info(f"打包: {self.config.board_name}_gpp.bin")
-        cmd = f"ls -al hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
-        cmd += "hpm_sub_header rootca.der rootfs_BMC.img.cms cms.crl rootfs_BMC.tar.gz"
+        files = f"hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
+        files += f"hpm_sub_header rootca.der rootfs_{self.suffix}.img.cms cms.crl rootfs_{self.suffix}.tar.gz"
+        cmd = f"ls -al {files}"
         self.run_command(cmd, show_log=True)
 
         target_path = f"{self.config.work_out}/{self.config.board_name}_gpp.bin"
-        cmd = f"cat hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
-        cmd += "hpm_sub_header rootca.der rootfs_BMC.img.cms cms.crl rootfs_BMC.tar.gz"
-        self.info("执行命令: " + cmd)
+        cmd = f"cat {files}"
         self.pipe_command([cmd], target_path)
 
     def run(self):
@@ -99,31 +104,37 @@ class TaskClass(Task):
     def move_dependency(self):
         # 移动到tools/build_tools目录中
         self.chdir(self.config.sdk_path)
+        if self.config.chip == "1711":
+            self.prepare_boot_1711()
+        else:
+            self.prepare_boot_1712()
+
+    def prepare_boot_1711(self):
         unsigned_boot = None
         for file in os.listdir("."):
             if re.match("^Hi1711_[0-9]{8}_[0-9a-f]{40}.tar.gz$", file) is None:
                 continue
             unsigned_boot = file
             break
-    
+
         if self.config.self_sign:
             if not unsigned_boot:
                 raise errors.BmcGoException("打开了自签名模式但未找到待签名的uboot文件，构建失败")
-            self.run_command(f"tar -xvf {file}")
+            self.run_command(f"tar -xvf {unsigned_boot}")
             # 解压uboot_debug未签名包
             os.makedirs("origin_uboot_debug")
             self.run_command(f"tar -xvf bin/original_bin/uboot_debug.tar.gz -C origin_uboot_debug")
-            self.self_sign_uboot("origin_uboot_debug", ".", True)
+            self.self_sign_uboot_1711("origin_uboot_debug", ".", True)
             # 解压uboot未签名包
             os.makedirs("origin_uboot")
             self.run_command(f"tar -xvf bin/original_bin/uboot.tar.gz -C origin_uboot")
-            self.self_sign_uboot("origin_uboot", ".", False)
-        elif self.config.chip == "1711":
+            self.self_sign_uboot_1711("origin_uboot", ".", False)
+        else:
             self.run_command(f"dd if=Hi1711_boot_4096_pmode.bin of=Hi1711_boot_pmode.bin bs=1k count=1024 skip=768")
             self.run_command(f"dd if=Hi1711_boot_4096_pmode_debug.bin of=Hi1711_boot_pmode_debug.bin bs=1k " +
                             "count=1024 skip=768")
 
-    def self_sign_uboot(self, uboot_dir, output_dir, is_debug):
+    def self_sign_uboot_1711(self, uboot_dir, output_dir, is_debug):
         """签名uboot包"""
         cwd = os.getcwd()
         output_dir = os.path.realpath(output_dir)
@@ -137,9 +148,15 @@ class TaskClass(Task):
         self.signature("uboot.bin", "uboot.bin.cms", "cms.crl", "rootca.der")
         self.copy_gpp_headers_files()
         self.run_command("gpp_header uboot")
-        self.run_command("make_uboot_img.sh 768")
-        run_cmd = f"dd if=Hi1711_boot_4096.bin of={output_dir}/Hi1711_boot_pmode{debug_flag}.bin " \
+        self.run_command(f"make_uboot_img.sh {l0_kb_size}")
+        run_cmd = (
+            f"dd if=Hi1711_boot_4096.bin of={output_dir}/Hi1711_boot_pmode{debug_flag}.bin "
             f" bs=1K count=1024 skip={l0_kb_size}"
+        )
         self.run_command(run_cmd)
         self.run_command(f"cp Hi1711_boot_4096.bin {output_dir}/Hi1711_boot_4096{debug_flag}.bin")
         self.chdir(cwd)
+
+    def prepare_boot_1712(self):
+        # 打桩函数，不允许变更函数名，供扩展实现
+        pass

bmcgo/tasks/task_buildhpm_ext4.py

@@ -22,6 +22,8 @@ import os
 import stat
 import shutil
 import subprocess
+
+from bmcgo import misc
 from bmcgo.tasks.task import Task
 
 
@@ -58,9 +60,9 @@ class TaskClass(Task):
         digest = self.get_manufacture_config("base/signature/hpm_digest", ["sha256"])
         with os.fdopen(os.open(filelist, os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
                                stat.S_IWUSR | stat.S_IRUSR), 'w') as f:
-            f.write('Manifest Version: 1.0\n')
-            f.write('Create By: openUBMC\n')
-            f.write(f'Name: {hpm_file}\n')
+            f.write("Manifest Version: 1.0\n")
+            f.write(f"Create By: {misc.vendor()}\n")
+            f.write(f"Name: {hpm_file}\n")
             if "sha256" in digest:
                 sha256sum = shutil.which("sha256sum")
                 cmd = [sha256sum, hpm_file]

bmcgo/utils/fetch_component_code.py

@@ -251,10 +251,10 @@ class FetchComponentCode:
                      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")
+            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).stdout.strip())
+            nodes = result.get("graph").get("nodes")
             for node in nodes.values():
                 if node.get("ref").startswith(conan_version):
                     package_folder = node.get("package_folder")

bmcgo/utils/mapping_config_patch.py

@@ -411,7 +411,8 @@ class MappingConfigPatch(Task):
 
 
     def run(self):
-        if not os.path.isdir(self.config_patch_path):
+        ret = self.tools.run_command(f"test -d {self.config_patch_path}", ignore_error=True, sudo=True)
+        if ret.returncode != 0:
             return
 
         # 给予权限方便对文件做变更

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=35RGOj62SFVkQy27ERD5AR3h542oaBYQIVkYOOwLpfQ,562
+bmcgo/__init__.py,sha256=ZseRGGw1BIo33Zy9RTeEklcfSC1yc7r54gsFo5abONU,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -195,7 +195,7 @@ bmcgo/component/template_v2/conanfile.deploy.py.mako,sha256=Xbd-PlfVHOWeRFLfvzIN
 bmcgo/functional/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/functional/analysis.py,sha256=4FaJlz7CbupHAdCdhdrRZCTlnHZ0bz7Cy32FNg9Ik_0,4097
 bmcgo/functional/bmc_studio_action.py,sha256=1-O44mp--_r6M971cZ5JgutcQMM8aQtfQgDsSRXSrX8,3920
-bmcgo/functional/check.py,sha256=lW9RAEhgo0CTrZW1iB6cetQBg_S_vtqtUchUqEy3JSU,9432
+bmcgo/functional/check.py,sha256=MSWjgPpHPHqM7uSyHFZLHPmQHY4KP9kXjQVGJxht_x4,9614
 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
@@ -224,10 +224,10 @@ bmcgo/tasks/__init__.py,sha256=VapgzhPMmB7dzPIRohoVm1jjfVn_v97cYNCRmkxScaU,539
 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
-bmcgo/tasks/task_build_rootfs_img.py,sha256=jRw-psICpACRspQOJ4e6zatG1a63V7yTpajnBmRL59E,28937
+bmcgo/tasks/task_build_rootfs_img.py,sha256=ffFLFVZ6wMpAvUi9au32IYNTr8TBmi7R6ZE1orvOj68,30565
 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_buildgppbin.py,sha256=VdViuNyOEBwHV3zbP6fJnZ3aUxK_RwyIPTv4Hseszrw,7018
+bmcgo/tasks/task_buildhpm_ext4.py,sha256=giAWz-XYmtYv6KTK9BJOyXJY7yDar6oONmEvHPoqsl0,3514
 bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2BaRQkH7KP3zwJ6FI,5393
 bmcgo/tasks/task_download_buildtools.py,sha256=imiOIWXxKOiWolALasTuSp3EkXrVeFWD0bPLERA78W0,4520
 bmcgo/tasks/task_download_dependency.py,sha256=-ZkRcUKZyx3KYWlbBEOoJEm9rpfDGIItnJZQqpimNDM,3369
@@ -245,10 +245,10 @@ 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=gLgo3J3s5DyuoKXuOArjxfQZxvCCt_bOWbI6teH5CNQ,12328
+bmcgo/utils/fetch_component_code.py,sha256=4C65ct7HdsgaRuF86ifttHQFmGQQCjaA0UhvHdQ8NRY,12329
 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
+bmcgo/utils/mapping_config_patch.py,sha256=ersqH5AmDvSfrOLbsNs3mfBxLQ3AUbJlCAjjtO6dMDk,16909
 bmcgo/utils/merge_csr.py,sha256=JNxHCfW1au84WQshdz0aQy8wMTEOHonjQT3s6LjlZN4,4580
 bmcgo/utils/perf_analysis.py,sha256=fh6lV9AAKVhpPkGPwAJ8EWfGfUoHjqGYQxrvc32Xiac,4767
 bmcgo/utils/tools.py,sha256=MmFWnfL1ahRReBb7QaHjLNH3731IXDiBBRiOk9CPsQE,33152
@@ -263,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.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,,
+openubmc_bingo-0.6.70.dist-info/METADATA,sha256=r8PH4Z1EhzTs-bAcIfANC1pVpQ8J-6P2Ziz4ZfrTbcE,1010
+openubmc_bingo-0.6.70.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.70.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.70.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.70.dist-info/RECORD,,