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

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/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/tasks/task_hpm_envir_prepare.py

@@ -13,42 +13,11 @@ import os
 import subprocess
 import time
 from multiprocessing import Process
+
 from bmcgo.tasks.task import Task
 from bmcgo import errors
 
 
-class SignProcess(Process):
-    def __init__(self, work: Task):
-        super().__init__()
-        self.work = work
-        self.config = self.work.config
-
-    def run(self):
-        self.work.work_name = "sign_rootfs_image"
-        self.work.chdir(self.config.build_path)
-        if self.config.self_sign:
-            self.work.signature(f"{self.config.work_out}/rootfs_BMC.img",
-                                f"{self.config.work_out}/rootfs_BMC.img.cms",
-                                f"{self.config.work_out}/cms.crl",
-                                f"{self.config.work_out}/rootca.der")
-        else:
-            out_file = f"{self.config.work_out}/rootfs_BMC.img.cms"
-            self.work.tools.pipe_command([f"echo 'cms placeholder'"], out_file=out_file)
-
-
-class TarImageProcess(Process):
-    def __init__(self, work):
-        super().__init__()
-        self.work: Task = work
-        self.config = self.work.config
-
-    def run(self):
-        self.work.work_name = "tar_rootfs_image"
-        self.work.chdir(self.config.work_out)
-        self.work.run_command("tar --format=gnu --exclude BMC_rootfs.tar.gz -czf rootfs_BMC.tar.gz rootfs_BMC.img")
-        self.work.success("tar BMC_rootfs.tar.gz successfully")
-
-
 class TaskClass(Task):
     skip_post_hpm = False
 
@@ -94,26 +63,36 @@ class TaskClass(Task):
             f"sed -i \"/^Version=/s/{curr_ver}/{ver}/g\" update.cfg")
         self.run_command("chmod +x . -R")
 
-    def run(self):
-        # 创建签名进程
-        sign = SignProcess(self)
-        sign.start()
+    def sign_img(self):
+        if self.config.self_sign:
+            self.self_sign()
+        else:
+            self.online_sign()
+
+    # 自签名函数，继承类可扩展，不能变更方法名，重要!!!
+    def self_sign(self):
+        self.signature(
+            f"{self.config.work_out}/rootfs_BMC.img",
+            f"{self.config.work_out}/rootfs_BMC.img.cms",
+            f"{self.config.work_out}/cms.crl",
+            f"{self.config.work_out}/rootca.der",
+        )
+
+    # 在线签名函数，继承类可扩展，不能变更方法名，重要!!!
+    def online_sign(self):
+        # bingo无需在线签名逻辑，仅占位满足后续流程即可
+        out_file = f"{self.config.work_out}/rootfs_BMC.img.cms"
+        self.pipe_command([f"echo 'cms placeholder'"], out_file=out_file)
+
+    def tar_img(self):
+        self.run_command("tar --format=gnu --exclude BMC_rootfs.tar.gz -czf rootfs_BMC.tar.gz rootfs_BMC.img")
+        self.success("tar BMC_rootfs.tar.gz successfully")
 
+    def run(self):
+        # 签名
+        self.chdir(self.config.build_path)
+        self.sign_img()
         self.prepare_hpm()
-
-        # 创建压缩进程
-        tar = TarImageProcess(self)
-        tar.start()
-        while True:
-            if not sign.is_alive():
-                if sign.exitcode is not None and sign.exitcode != 0:
-                    raise errors.BmcGoException(f"签名进程发生错误, 返回值: {sign.exitcode}")
-                break
-            time.sleep(0.1)
-        while True:
-            if not tar.is_alive():
-                if tar.exitcode is not None and tar.exitcode != 0:
-                    raise errors.BmcGoException(f"打包进程发生错误, 返回值: {tar.exitcode}")
-                break
-            time.sleep(0.1)
-
+        # 压缩
+        self.chdir(self.config.work_out)
+        self.tar_img()

bmcgo/tasks/task_packet_to_supporte.py

@@ -25,8 +25,7 @@ class TaskClass(Task):
     def __init__(self, config: Config, work_name=""):
         super().__init__(config, work_name)
 
-    def version_xml_update(self, hpm_name, version_name):
-        version_file = os.path.join(self.config.board_path, version_name)
+    def version_xml_update(self, hpm_name, version_file):
         if not os.path.exists(version_file):
             return
         srv_tree = ET.parse(version_file)
@@ -44,6 +43,14 @@ class TaskClass(Task):
         srv_root.find(PACKAGE).find('Size').text = str(os.path.getsize(hpm_name))
         srv_tree.write(version_file)
 
+    # 打桩函数，函数名不允许变更
+    def package_mib(self, build_path, zip_name, target_dir):
+        pass
+
+    # 打桩函数，函数名不允许变更
+    def write_ingredient(self, build_path):
+        pass
+
     def run(self):
         if self.config.manufacture_code is not None:
             self.info(f"编码为 {self.config.manufacture_code} 为 togdp 编码, 跳过构建 tosupporte 包")
@@ -70,8 +77,9 @@ class TaskClass(Task):
         self.chdir(build_path)
         # 复制所需文件
         files = self.get_manufacture_config(supporte_config + "/files")
-        self.version_xml_update(f"{self.config.work_out}/rootfs_{self.config.board_name}.hpm", "version.xml")
         self.copy_manifest_files(files)
+        self.version_xml_update(f"{self.config.work_out}/rootfs_{self.config.board_name}.hpm", "version.xml")
+        self.write_ingredient(build_path)
 
         # 由于tosupporte解压后没有文件夹
         cmd = "zip -1 -rq {} .".format(zip_name)
@@ -82,6 +90,6 @@ class TaskClass(Task):
         os.makedirs(target_dir, exist_ok=True)
         # 硬链接文件目标目录
         self.link(zip_name, os.path.join(target_dir, zip_name))
-
+        self.package_mib(build_path, zip_name, target_dir)
         self.chdir(self.config.temp_path)
         shutil.rmtree(build_path, ignore_errors=True)

bmcgo/tasks/task_prepare.py

@@ -142,7 +142,7 @@ class TaskClass(Task):
 
             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.run_command(f"cp -rf {tmp}/hpm_tools/. /usr/bin/", sudo=True)
 
             self.log.info(f"安装 bmc_sdk 完成！")
 

bmcgo/tasks/task_sign_and_pack_hpm.py

@@ -18,14 +18,9 @@ class TaskClass(Task):
     def sign_hpms(self):
         self.chdir(self.config.work_out)
         if self.config.self_sign:
-            self.chdir(self.config.work_out)
-            # 复制预置的ca, crl作为签名文件，并复制cms
-            self.signature(f"rootfs_{self.config.board_name}.filelist",
-                           f"rootfs_{self.config.board_name}.filelist.cms",
-                           "cms.crl", "rootca.der")
+            self._self_sign()
         else:
-            self.run_command(f"touch {self.config.work_out}/rootfs_{self.config.board_name}.filelist.cms")
-            self.run_command(f"cp {self.config.board_path}/cms.crl {self.config.work_out}/cms.crl")
+            self._online_sign()
             self.chdir(self.config.work_out)
         
         # 生成的文件为rootfs_{board_name}.hpm.signed
@@ -40,3 +35,16 @@ class TaskClass(Task):
 
     def run(self):
         self.sign_hpms()
+
+    def _self_sign(self):
+        # 复制预置的ca, crl作为签名文件，并复制cms
+        self.signature(f"rootfs_{self.config.board_name}.filelist",
+                        f"rootfs_{self.config.board_name}.filelist.cms",
+                        "cms.crl", "rootca.der")
+
+    # 在线签名逻辑，生成对应的crl和cms文件
+    # 此函数供继承类重写，不允许更改函数名，重要！！！
+    def _online_sign(self):
+        # bingo不实现在线签名逻辑，这里创建空文件满足后续流程
+        self.run_command(f"touch {self.config.work_out}/rootfs_{self.config.board_name}.filelist.cms")
+        self.run_command(f"cp {self.config.board_path}/cms.crl {self.config.work_out}/cms.crl")

bmcgo/utils/component_version_check.py

@@ -94,7 +94,7 @@ class ComponentVersionCheck:
     def get_dict(self):
         self.openubmc_folder()
         self.manifest_dict = self.generate_manifest_dict()
-        self.ibmc_lock_dict = self.generate_ibmc_lock_dict()
+        self.ibmc_lock_dict = self.generate_bmc_lock_dict()
 
     def generate_manifest_dict(self) -> dict:
         """根据 manifest.yml(conan目录) 配置生成 组件名: 组件配置 的字典
@@ -106,8 +106,8 @@ class ComponentVersionCheck:
         manifest_dict = {x[misc.CONAN].split('/')[0]: x[misc.CONAN].split('@')[0] for x in dependency_list}
         return manifest_dict
 
-    def generate_ibmc_lock_dict(self) -> dict:
-        """根据 ibmc.lock 配置生成 组件名: 组件配置 的字典
+    def generate_bmc_lock_dict(self) -> dict:
+        """根据 bmc.lock 配置生成 组件名: 组件配置 的字典
 
         Returns:
             dict: 返回 组件名: 组件配置 的字典
@@ -116,7 +116,7 @@ class ComponentVersionCheck:
             component_list = self.ibmc_lock["graph_lock"]["nodes"]
             ibmc_lock_dict = {x["ref"].split('/')[0]: x["ref"].split('@')[0]
                             for x in [component_conf for _, component_conf in component_list.items()]}
-            ibmc_lock_dict.pop("openubmc")
+            ibmc_lock_dict.pop(misc.community_name())
         else:
             component_list = self.ibmc_lock["requires"]
             ibmc_lock_dict = {x.split('/')[0]: x.split('@')[0] for x in component_list}

bmcgo/utils/config.py

@@ -489,6 +489,7 @@ class Config:
         os.environ['PATH'] = os.environ["PATH"] + ":" + os.path.join(self.tools_path, "build_tools")
         # CI工程上库路径
         self.output_path = os.path.join(self.code_root, 'output')
+        self.mdb_output = os.path.join(self.output_path, "mdb")
 
     def init_conan_profile(self, profile: str):
         manifest_profile = self.get_manufacture_config("base/profile")
@@ -762,6 +763,8 @@ class Config:
 
     def merge_dependencies(self, dependencies, subsys_comps, base_deps):
         for com_package in dependencies:
+            if "overwrite" in com_package:
+                del com_package["overwrite"]
             com_package_split = com_package.get(misc.CONAN).split("/")
             if len(com_package_split) > 2:
                 continue