openubmc-bingo 0.6.68__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.68'
+__version__ = '0.6.70'

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
@@ -221,6 +222,26 @@ 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("开始根据配置映射打补丁")
@@ -229,6 +250,9 @@ class TaskClass(Task):
             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()
 

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

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=tj3MA6yimsagyzinPe_hVMnI2xQ-3IToRSL2kcmRQAU,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
@@ -224,9 +224,9 @@ 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=CDczgL2qiEUyAIlDVbj5o0DJzFs_HW5UdoVaFPznvdg,29207
+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_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
@@ -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.68.dist-info/METADATA,sha256=Xcay0PnvxM54F5ni52ceZtxY54ymFT-E4W3lt7QzE_M,1010
-openubmc_bingo-0.6.68.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.68.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.68.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.68.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,,