openubmc-bingo 0.6.45__py3-none-any.whl → 0.6.99__py3-none-any.whl

bmcgo/functional/schema_valid.py

@@ -13,6 +13,7 @@
 import os
 import json
 import argparse
+import re
 
 import yaml
 import jsonschema
@@ -21,14 +22,34 @@ from jsonschema import exceptions as jc
 from bmcgo.logger import Logger
 from bmcgo.bmcgo_config import BmcgoConfig
 from bmcgo import misc
+from bmcgo.errors import BmcGoException
 
 log = Logger()
 command_info: misc.CommandInfo = misc.CommandInfo(
     group=misc.GRP_MISC,
-    name="validate_yml",
-    description=["对指定目录下所有yaml文件或指定yaml文件进行 schema 规范检查"],
+    name="schema_validate",
+    description=["对指定目录下所有yaml/json文件或指定yaml/json文件进行 schema 规范检查"],
     hidden=True
 )
+JSON_TYPE = "json"
+YML_TYPE = "yml"
+SCHEMA_FILES_DIR_PATH = "/usr/share/bingo/schema"
+
+
+def load_json_safely(check_file):
+    try:
+        with open(check_file, "r") as fp:
+            check_data = json.load(fp)
+        return check_data
+    except json.JSONDecodeError as e:
+        log.info(f"Failed to parse JSON file {check_file} : {e}")
+        return None
+    except FileNotFoundError:
+        log.info(f"File not found: {check_file}")
+        return None
+    except Exception as e:
+        log.info(f"Unexpected error reading {check_file} : {e}")
+        return None
 
 
 def if_available(_: BmcgoConfig):
@@ -43,34 +64,95 @@ class BmcgoCommand:
             bconfig (BmcgoConfig): bmcgo 配置
         """
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} validate_yml", description="Validate yaml files",
+        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} schema_valid", description="Validate yaml files",
                                          add_help=True, formatter_class=argparse.RawTextHelpFormatter)
         parser.add_argument("-t", "--target", help="目标文件夹或单个yaml文件，默认当前目录", default=".")
+        parser.add_argument("-csr", "--csr", help="仅校验.sr文件", action=misc.STORE_TRUE, default=False)
 
         parsed_args = parser.parse_args(*args)
         self.target = os.path.realpath(parsed_args.target)
+        self.csr_pattern = parsed_args.csr
+
+    @staticmethod
+    def get_schema_in_json(check_file: str):
+        check_data = load_json_safely(check_file)
+        if check_data:
+            schema_file = check_data.get("$schema", "")
+            if schema_file:
+                return schema_file
+            
+        cwd = os.getcwd()
+        os.chdir(os.path.dirname(check_file))
+        bconfig = BmcgoConfig()
+        os.chdir(cwd)
+        if bconfig.component and (os.path.dirname(check_file) == os.path.join(bconfig.component.folder, "mds")
+                                  or os.path.join(bconfig.component.folder, "mds", "debug")):
+            check_file_name, _ = os.path.basename(check_file).rsplit(".", 1)
+            schema_file = f"{SCHEMA_FILES_DIR_PATH}/mds.{check_file_name}.schema.v1.json"
+            if os.path.isfile(schema_file):
+                return schema_file
+        if bconfig.component and "json/intf/mdb" in check_file:
+            schema_file = f"{SCHEMA_FILES_DIR_PATH}/interface.schema.json"
+            if os.path.isfile(schema_file):
+                return schema_file
+        if bconfig.component and "json/intf/mdb" in check_file:
+            schema_file = f"{SCHEMA_FILES_DIR_PATH}/path.schema.json"
+            if os.path.isfile(schema_file):
+                return schema_file
+        if bconfig.component and check_file.endswith(".sr"):
+            schema_file = f"{SCHEMA_FILES_DIR_PATH}/csr.schema.json"
+            if os.path.isfile(schema_file):
+                return schema_file
+        return None
+
+    @staticmethod
+    def get_decleared_schema_file(check_file: str, file_type=YML_TYPE):
+        if file_type == JSON_TYPE:
+            return BmcgoCommand.get_schema_in_json(check_file)
+        return misc.get_decleared_schema_file(check_file)
 
     @staticmethod
-    def schema_valid(check_file: str) -> bool:
+    def schema_valid(check_file: str, file_type=YML_TYPE) -> bool:
         """ 有效性校验
 
         Args:
             check_file (str): 要校验的文件名称
         """
-        schema_file = misc.get_decleared_schema_file(check_file)
-        if schema_file == "":
+        schema_file = BmcgoCommand.get_decleared_schema_file(check_file, file_type)
+        if not schema_file:
             log.warning(f"文件 {check_file} 没有配置 schema 检查")
             return True
+        
+        http_regex = r'https?://.*'
+        if re.match(http_regex, schema_file):
+            log.warning(f"文件 {check_file} 配置的 {schema_file} 为外部schema, 跳过检查")
+            return True
+        
+        schema_file_path = os.path.join(os.path.dirname(check_file), schema_file)
+        if not os.path.isfile(schema_file_path):
+            raise BmcGoException(f"schema校验文件 {schema_file_path} 不存在")
+        
+        log.debug("开始校验文件：%s", check_file)
         with open(schema_file, "rb") as fp:
             schema = json.load(fp)
         with open(check_file, "r") as fp:
-            check_data = yaml.safe_load(fp)
-        log.info("开始校验文件: %s", check_file)
+            if file_type == JSON_TYPE:
+                try:
+                    check_data = json.load(fp)
+                except Exception as e:
+                    log.info(f"解析JSON文件失败：{check_file}, 错误：{e}")
+                    return False
+            else:
+                check_data = yaml.safe_load(fp)
+
         try:
             jsonschema.validate(check_data, schema)
-            log.success("校验成功: %s", check_file)
+            log.debug("校验成功：%s", check_file)
             return True
         except (jc.ValidationError, jc.SchemaError) as e:
+            if os.path.basename(check_file) != 'service.json':
+                log.warning(f" >>>>>> {check_file} 校验失败 <<<<<<\n{e}")
+                return True
             log.error(f" >>>>>> {check_file} 校验失败 <<<<<<\n{e}")
             return False
 
@@ -86,26 +168,40 @@ class BmcgoCommand:
         check_result = []
 
         if os.path.isfile(self.target):
-            check_result.append(self.schema_valid(self.target))
+            if str(self.target).endswith(".sr"):
+                check_result.append(self.schema_valid(self.target, "json"))
+            else:
+                check_result.append(self.schema_valid(self.target))
             return 0
-
         check_result = self._validate_yml_files()
 
         if check_result and False in check_result:
             log.error("请仔细阅读报错日志, 日志中会提示哪些是必要属性, 或哪个属性配置错误")
             raise AttributeError(f"所有 .yml/.yaml 文件检查失败, 请仔细检查报错并解决问题项")
         if not check_result:
-            log.warning("未找到yml文件")
+            if self.csr_pattern:
+                log.warning("未找到yml文件")
+            else:
+                log.warning("未找到yml文件")
         return 0
 
     def _validate_yml_files(self):
         check_result = []
         for root, _, files in os.walk(self.target):
             for filename in files:
-                if not self._is_yml_file(filename):
-                    continue
                 schema_file = os.path.join(root, filename)
-                check_result.append(self.schema_valid(schema_file))
+                if "test" in schema_file.split(os.sep):
+                    continue
+                file_type = None
+                if not self._is_yml_file(filename) and not self.csr_pattern:
+                    file_type = YML_TYPE
+                elif filename.endswith(".json") and not self.csr_pattern:
+                    file_type = JSON_TYPE
+                elif filename.endswith(".sr") and self.csr_pattern:
+                    file_type = JSON_TYPE
+                else:
+                    continue
+                check_result.append(self.schema_valid(schema_file, file_type))
         return check_result
 
 

bmcgo/functional/upgrade.py

@@ -43,8 +43,7 @@ bingo 升级工具
 
 class BmcgoCommand:
     VERSION_PATTERN = re.compile(
-        r"^([a-zA-Z0-9_-]+)\s*([<>]=?|[!~]?=)?\s*([a-zA-Z0-9._+-]*|"
-        rf"{install_consts.INSTALL_LATEST})$"
+        r"^([a-zA-Z0-9._-]+)((?:>=|<=|>|<|=)\s*[\s\S]+)"
     )
 
     def __init__(self, bconfig: BmcgoConfig, *args):
@@ -73,7 +72,7 @@ class BmcgoCommand:
             help="列出可安装版本"
         )
 
-        args, _ = parser.parse_known_args()
+        args, _ = parser.parse_known_args(*args)
 
         self.version = args.version
         self.force = args.force
@@ -83,8 +82,9 @@ class BmcgoCommand:
         self.plugin_path = Path(bconfig.bmcgo_config_list.get(misc.CUSTOM_PLUGINS, misc.DEFAULT_PLUGINS_PATH))
 
     def run(self):
-        app, opt, ver = self._parse_version()
-        self.installer.init(app, opt, ver, self.plugin_path)
+        app, version_range = self._parse_version()
+        version_range = version_range.replace(",", " ")
+        self.installer.init(app, version_range, self.plugin_path)
 
         if self.list:
             self._list_all_versions()
@@ -105,4 +105,4 @@ class BmcgoCommand:
         if match:
             return match.groups()
         self.version = install_consts.INSTALL_DEFAULT
-        return self._parse_version()
+        return install_consts.INSTALL_ALL, install_consts.INSTALL_LATEST

bmcgo/misc.py

@@ -41,6 +41,7 @@ DESCRIPTION = "description"
 PATTERN = "pattern"
 ENV_CONST = "env"
 JSON_CHECKER = "json_checker"
+HPM_SIGNER = "hpm_signer"
 HTTP_PROXY_CONST = "http_proxy"
 HTTPS_PROXY_CONST = "https_proxy"
 FTP_PROXY_CONST = "ftp_proxy"

bmcgo/tasks/task_build_conan.py

@@ -148,6 +148,15 @@ class CopyComponent(Process):
                                     command_key=self.comp)
 
     def _copy_files(self):
+        mdb_path = os.path.join(self.package_folder, "opt/bmc/apps/mdb_interface/")
+        if os.path.isdir(mdb_path):
+            cmd = f"cp -dfr {mdb_path} {self.config.mdb_output}"
+            self.work.run_command(cmd)
+        mds_path = os.path.join(self.package_folder, "usr/share/doc/openubmc")
+        if os.path.isdir(mds_path):
+            cmd = f"cp -dfr {mds_path}/. {self.config.mdb_output}"
+            self.work.run_command(cmd)
+        # for dirs, file, _ in os.walk(mds_path)
         # 由于复制时有很多同名路径，cp命令有概率失败，10次复制尝试
         cmd = "sudo cp -dfr {}/. {}".format(self.package_folder, self.config.rootfs_path)
         for _ in range(0, 10):
@@ -251,8 +260,8 @@ class ConanLockParse:
             for com, entry_degree in entry_degree_temp_dict.items():
                 if entry_degree != 0:
                     continue
-                # openubmc作为一个最终组件，不推送(远端没有，直接弹出)
-                if com.startswith("openubmc/"):
+                # 最终组件，不推送(远端没有，直接弹出)
+                if com.startswith(f"{misc.community_name()}/"):
                     self._degree.pop(com)
                     break
                 cmd_tmp = cmd.replace("com_name", f"{com}")
@@ -459,7 +468,7 @@ class TaskClass(Task):
         self.component_check = ComponentVersionCheck(
             manifest_yml="manifest.yml",
             ibmc_lock=self.lockfile,
-            community_name="openubmc",
+            community_name=misc.community_name(),
             openubmcsdk=openubmcsdk
             )
         for dep in deps:
@@ -481,6 +490,9 @@ class TaskClass(Task):
                     self.board_option = self.board_option + " -o */*:{}={}".format(key, val)
                 else:
                     self.board_option = self.board_option + " -o {}/*:{}={}".format(name, key, val)
+            options = dep.get("tool_options", {})
+            for key, val in options.items():
+                self.board_option = self.board_option + " -o:b {}/*:{}={}".format(name, key, val)
         # 当使能Luajit又未向skynet传递enable_luajit配置项时需要添加使能参数
         if not skynet_with_enable_luajit and self.config.enable_luajit:
             self.board_option += f" -o */*:enable_luajit={self.config.enable_luajit}"
@@ -521,7 +533,7 @@ class TaskClass(Task):
         self.component_check = ComponentVersionCheck(
             manifest_yml="manifest.yml",
             ibmc_lock=self.lockfile,
-            community_name="openubmc",
+            community_name=misc.community_name(),
             openubmcsdk=openubmcsdk
             )
         for dep in deps:
@@ -547,6 +559,9 @@ class TaskClass(Task):
                     self.warning(f"根据manifest.yml配置，当前产品的enable_luajit配置为{val}，忽略命令行指定的-jit参数")
                     self.config.set_enable_luajit(val)
                     skynet_with_enable_luajit = True
+            options = dep.get("tool_options", {})
+            for key, val in options.items():
+                self.board_option = self.board_option + " -o:b {}/*:{}={}".format(name, key, val)
         # 当使能Luajit又未向skynet传递enable_luajit配置项时需要添加使能参数
         if not skynet_with_enable_luajit and self.config.enable_luajit:
             self.board_option += f" -o skynet:enable_luajit={self.config.enable_luajit}"
@@ -582,7 +597,7 @@ class TaskClass(Task):
         with os.fdopen(os.open(self.package_info, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, stat.S_IWUSR | stat.S_IRUSR |
                                stat.S_IWGRP | stat.S_IRGRP | stat.S_IWOTH | stat.S_IROTH), 'w') as fp:
             for package in require_list:
-                if "openubmc/" not in package:
+                if f"{misc.community_name()}/" not in package:
                     fp.write(f"{package.split('#')[0]}\n")
                 else:
                     package_info_list.remove(package)
@@ -813,6 +828,9 @@ class TaskClass(Task):
         os.makedirs(openubmc_dir, exist_ok=True)
         shutil.copytree(conanfile_dir, openubmc_dir, dirs_exist_ok=True)
         self.chdir(openubmc_dir)
+        # 替换默认的根组件名为实际的community name
+        tools.run_command(f"sed -i 's/openubmc/{misc.community_name()}/g' conanfile.py")
+
         # 复制manifest.yml文件
         if misc.conan_v2():
             self.merge_manifest_v2()
@@ -1051,6 +1069,9 @@ class TaskClass(Task):
 
     def package(self):
         self.chdir(self.conan_install)
+        if os.path.isdir(self.config.mdb_output):
+            shutil.rmtree(self.config.mdb_output)
+        os.makedirs(self.config.mdb_output, 0o755)
         if misc.conan_v2():
             self.package_v2()
             return
@@ -1061,7 +1082,7 @@ class TaskClass(Task):
         for dirname in os.listdir("."):
             if not os.path.isdir(dirname):
                 continue
-            if dirname != "rootfs" and dirname != "openubmc":
+            if dirname != "rootfs" and dirname != misc.community_name():
                 comps.append(dirname)
         
         self.copy_components(comps, profile)

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()