openubmc-bingo 0.6.59__py3-none-any.whl → 0.6.61__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.59'
+__version__ = '0.6.61'

bmcgo/component/analysis/analysis.py

@@ -128,14 +128,15 @@ class AnalysisComp():
                 dependencies_keys = [key for key, dep in dependencies_data.items() if dep["direct"]]
                 requires[node.index] = dependencies_keys
         comm_name = misc.community_name()
+        excluded_prefixes = (comm_name, "openubmc")
         for index, pkg in packages.items():
-            if not pkg.name.startswith(comm_name):
+            if not pkg.name.startswith(excluded_prefixes):
                 self.set_node_subsys(pkg)
             for require_id in requires.get(index, []):
                 require_package = packages.get(int(require_id), None)
                 if require_package:
                     pkg.requires.append(require_package)
-            if not pkg.name.startswith(comm_name):
+            if not pkg.name.startswith(excluded_prefixes):
                 self.nodes.append(pkg)
 
     def run(self):

bmcgo/component/component_helper.py

@@ -194,3 +194,13 @@ class ComponentHelper:
             stage = misc.StageEnum.STAGE_RC.value
         user_channel = f"@{misc.conan_user()}/{stage}"
         return user_channel
+
+    @staticmethod
+    def get_full_reference(components: List[str], stage: str):
+        user_channel = ComponentHelper.get_user_channel(stage)
+        full_reference_comps = []
+        for comp in components:
+            if "@" not in comp:
+                comp += user_channel
+            full_reference_comps.append(comp)
+        return full_reference_comps

bmcgo/component/test.py

@@ -876,8 +876,19 @@ class TestComp():
 
     def check_folder(self):
         test_package_folder = os.path.join(self.folder, "test_package")
-        test_folder = os.path.join(self.folder, "test")
-        if os.path.isdir(test_folder) or os.path.isdir(test_package_folder):
+        ut_path = os.path.join(self.folder, "test", "unit")
+        it_path = os.path.join(self.folder, "test", "integration")
+        fz_path = os.path.join(self.folder, "test", "fuzz")
+
+        has_dt_type = self.unit_test or self.integration_test or self.fuzz_test
+        if not has_dt_type:
+            self.unit_test = True
+        self.unit_test = os.path.isdir(ut_path) and self.unit_test
+        self.integration_test = os.path.isdir(it_path) and self.integration_test
+        self.fuzz_test = os.path.isdir(fz_path) and self.fuzz_test
+        has_dt_type = self.unit_test or self.integration_test or self.fuzz_test
+
+        if os.path.isdir(test_package_folder) or has_dt_type:
             return True
         return False
 

bmcgo/functional/csr_build.py

@@ -160,8 +160,36 @@ command_info: CommandInfo = CommandInfo(
 class BmcgoCommand:
     def __init__(self, bconfig: BmcgoConfig, *args):
         self.bconfig = bconfig
+        parser = self.get_arg_parser()
+        parsed_args, _ = parser.parse_known_args(*args)
+        self.csr_path = os.path.realpath(parsed_args.path)
+        self.single = parsed_args.single
+        self.oem_path = parsed_args.oem
+        self.output_path = os.path.realpath(parsed_args.output_path)
+        self.json = parsed_args.json
+        self.bin = parsed_args.bin
+        self.hpm = parsed_args.hpm
+        self.all = parsed_args.all
+        self.tar = parsed_args.tar
+        self.frud = parsed_args.frud
+        self.max_size_map = parsed_args.max_config
+        self.uid = parsed_args.uid
+        # 保留原始参数集，用于重写初始化函数扩展参数解析
+        self.parsed_args = parsed_args
+        self.work_dir = None
+        self.target_dir = None
+        self.eeprom_sign_strategy = None
+        self.hpm_sign_strategy = None
+        self.tmp_dir = None
+        self.merger = Merger(self.output_path)
+
+    @staticmethod
+    def get_arg_parser():
+        '''
+        参数解析类扩展点，可重写此方法扩展自定义参数
+        '''
         parser = argparse.ArgumentParser(
-            prog="bingo build_csr",
+            prog=f"{misc.tool_name()} build_csr",
             description="csr出包，支持单个CSR和批量CSR出包",
             add_help=True,
             formatter_class=argparse.RawTextHelpFormatter,
@@ -189,25 +217,7 @@ class BmcgoCommand:
             help="eeprom大小限制的json配置文件路径，无配置时默认限制为32k",
             default=EEPROM_SIZE_LIMIT_CONFIG
         )
-        parsed_args, _ = parser.parse_known_args(*args)
-        self.csr_path = os.path.realpath(parsed_args.path)
-        self.single = parsed_args.single
-        self.oem_path = parsed_args.oem
-        self.output_path = os.path.realpath(parsed_args.output_path)
-        self.json = parsed_args.json
-        self.bin = parsed_args.bin
-        self.hpm = parsed_args.hpm
-        self.all = parsed_args.all
-        self.tar = parsed_args.tar
-        self.frud = parsed_args.frud
-        self.max_size_map = parsed_args.max_config
-        self.uid = parsed_args.uid
-        self.work_dir = None
-        self.target_dir = None
-        self.eeprom_sign_strategy = None
-        self.hpm_sign_strategy = None
-        self.tmp_dir = None
-        self.merger = Merger(self.output_path)
+        return parser
 
     @staticmethod
     def get_oem_data(dir_path: str, comp_name: str):
@@ -269,7 +279,7 @@ class BmcgoCommand:
         self.get_hpm_sign_strategy()
     
     def make_sr_binary(self, options: SrMakeOptions, hpm_temp_dir: str, max_size: int):
-        eeprom_build_controller = EepromBuild(self.bconfig, options, self.work_dir, self.eeprom_sign_strategy)
+        eeprom_build_controller = self._get_eeprom_builder(options)
         eeprom_data = eeprom_build_controller.build_eeprom()
         if len(eeprom_data) > max_size * 1024 - 40:
             raise errors.BmcGoException(f"Eeprom二进制文件大小超过限制: {options.comp_name}")
@@ -293,6 +303,8 @@ class BmcgoCommand:
         with open(binary_files[0], 'wb') as f:
             f.write(eeprom_data)
         for binary_file in binary_files[1:]:
+            if binary_file == binary_files[0]:
+                continue
             shutil.copy(binary_files[0], binary_file)
 
     def run(self):
@@ -325,12 +337,11 @@ class BmcgoCommand:
                     hpm_file = os.path.join(self.target_dir, f"{sr_make_options_list[0].comp_name}.hpm")
                 else:
                     hpm_file = os.path.join(self.target_dir, f"CSR-{get_timestamp()}.hpm")
-                params = (self.bconfig, hpm_file, self.work_dir, self.hpm_sign_strategy)
-                hpm_package = HpmBuild(*params)
+                hpm_package = self._get_hpm_builder(hpm_file)
                 log.info("开始执行hpm包构建任务...")
                 hpm_package.run()
             if self.single or self.frud or self.tar:
-                output_file = os.path.join(self.output_path, f"bingo-{get_timestamp()}.tar.gz")
+                output_file = os.path.join(self.output_path, f"{misc.tool_name()}-{get_timestamp()}.tar.gz")
                 tar_command = ['tar', '-czf', output_file, "-C", self.target_dir, "."]
                 try:
                     result = subprocess.run(tar_command, check=True)
@@ -340,12 +351,11 @@ class BmcgoCommand:
             else:
                 output_hpm_file = os.path.join(self.output_path, os.path.basename(hpm_file))
                 shutil.copy(hpm_file, output_hpm_file)
+                log.info(f"成功创建hpm包{os.path.basename(output_hpm_file)}")
             log.info("构建成功!")
         finally:
-            if os.path.exists(self.work_dir):
-                shutil.rmtree(self.work_dir)
-            if os.path.exists(self.tmp_dir):
-                shutil.rmtree(self.tmp_dir)
+            shutil.rmtree(self.work_dir, ignore_errors=True)
+            shutil.rmtree(self.tmp_dir, ignore_errors=True)
 
     def check_args(self):
         has_single_need_arg = self.bin or self.json or self.hpm or self.all
@@ -442,6 +452,19 @@ class BmcgoCommand:
         else:
             return False
 
+    def _get_hpm_builder(self, hpm_file: str):
+        '''
+        Hpm包构造器扩展点
+        '''
+        params = (self.bconfig, hpm_file, self.work_dir, self.hpm_sign_strategy)
+        return HpmBuild(*params)
+
+    def _get_eeprom_builder(self, option: SrMakeOptions):
+        '''
+        Eeprom内容构造器扩展点
+        '''
+        return EepromBuild(self.bconfig, option, self.work_dir, self.eeprom_sign_strategy)
+
 
 class EepromBuild:
     def __init__(self, bconfig, options, work_dir, strategy):
@@ -623,7 +646,7 @@ class EepromBuild:
     # 创建数字签名域数据
     def sign_eeprom(self, un_sign_data: bytearray):
         if self.strategy == SignatureTypeEnum.DEFAULT:
-            return self.get_eeprom_default_sign()
+            return self._get_eeprom_default_sign(un_sign_data)
         elif not (self.strategy == SignatureTypeEnum.SERVER_SIGN or
                   self.strategy == SignatureTypeEnum.SELF_SIGN):
             raise errors.BmcGoException("Invalid signing strategy.")
@@ -642,9 +665,6 @@ class EepromBuild:
             if os.path.exists(tmp_sign_path):
                 shutil.rmtree(tmp_sign_path)
             return self.build_sign(sign_data)
-    
-    def get_eeprom_default_sign(self):
-        return bytearray(self.sign_len)
 
     def get_eeprom_self_sign(self, un_sign_data):
         signing_key = self.load_key()
@@ -765,6 +785,9 @@ class EepromBuild:
         # 12. CRC32 校验和（4字节）
         eeprom_header_buf.put_uint32(self.get_crc32_check_sum(eeprom_header_buf.array()))
         return eeprom_header_buf.array()   
+        
+    def _get_eeprom_default_sign(self, _):
+        return bytearray(self.sign_len)
 
 
 class EepromHeader:
@@ -814,6 +837,7 @@ class HpmBuild:
 
     @staticmethod
     def sign_hpm_default():
+        log.info("未配置签名策略，跳过hpm包签名...")
         cms_file = os.path.realpath("image.filelist.cms")
         tool.pipe_command([f"echo 'cms placeholder'"], out_file=cms_file)
         crl_file = os.path.realpath("crldata.crl")
@@ -852,14 +876,13 @@ class HpmBuild:
     # 对hpm包进行签名
     def sign_hpm(self):
         if self.strategy == SignatureTypeEnum.DEFAULT:
-            log.info("未配置签名策略，跳过hpm包签名...")
             self.sign_hpm_default()
         elif self.strategy == SignatureTypeEnum.SELF_SIGN or\
                 self.strategy == SignatureTypeEnum.SERVER_SIGN:
             # 生成.filelist文件
             tool.run_command(f"cms_sign_hpm.sh 1 {self.hpm_name}", command_echo=False)
             shutil.copy("devkit.filelist", "image.filelist")
-            SignGenerator(self.bconfig, self.strategy, "image.filelist").sign_generate()
+            self._get_generator().sign_generate()
         else:
             raise errors.BmcGoException("Invalid signing strategy.")
 
@@ -879,6 +902,12 @@ class HpmBuild:
         self.sign_hpm()
         self.rebuild_hpm()
 
+    def _get_generator(self):
+        '''
+        签名工具扩展点
+        '''
+        return SignGenerator(self.bconfig, self.strategy, "image.filelist")
+
 
 class SignGenerator:
     def __init__(self, bconfig: BmcgoConfig, sign_strategy: str, unsigned_file: str):

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)

{openubmc_bingo-0.6.59.dist-info → openubmc_bingo-0.6.61.dist-info}/METADATA

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

{openubmc_bingo-0.6.59.dist-info → openubmc_bingo-0.6.61.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=WCeuHxskNJNexpFQY1v5EHAl1f6ysPef-7lxsGm9TfE,562
+bmcgo/__init__.py,sha256=DX6yFzfahIAtXohICvEQ5Az3yw9BBmKcaaVBy7kWaXo,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -170,12 +170,12 @@ bmcgo/codegen/lua/v1/templates/apps/utils/mdb_obj.lua.mako,sha256=oCzx2u3bjvCdNK
 bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/component/build.py,sha256=zEtX3IG43z-EC8frpuRRH8zx2KjVuA1LlLnhDgErhqE,12920
 bmcgo/component/component_dt_version_parse.py,sha256=-Rt6i2fZrmYNZGoMqB21D_T9fC7fhhtUFIFvdPsMICM,14188
-bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6oJLXcEA,7933
+bmcgo/component/component_helper.py,sha256=gB2N3eRH8gmWbYBHAV-ejD4bEhk71ZVeuXi46z_mLuU,8294
 bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,6544
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
 bmcgo/component/package_info.py,sha256=pYgubJ-564JXQmEaSlYfGnoVgrNlY3O5jJP1vxZe-Qc,14844
-bmcgo/component/test.py,sha256=Kpg5fmcJ-F2lDlHsKTBXjhB00T-IOr5QWGfHsRXVgA0,45260
-bmcgo/component/analysis/analysis.py,sha256=oc5m6qGWZm6G3n8cVENs86DAWywMNuxTqhO5QIb9fX8,9363
+bmcgo/component/test.py,sha256=8_70RP9LFr0lF0WlqTWBXGBlB4v6FOVc1j_sDyhogtg,45815
+bmcgo/component/analysis/analysis.py,sha256=pwX14SRtKS8ZATrOCniENHiuuEHAjCOq11P5AI1aAJc,9431
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
 bmcgo/component/analysis/data_deps.py,sha256=lDCVZ1B56pOW3BApCroujEaak4I07tN9mDOWruhuDkc,16431
 bmcgo/component/analysis/dep-rules.json,sha256=fLNK_MN7plr9WYLzlla56geGBreYQ_3t9xZSIX0beag,35251
@@ -198,7 +198,7 @@ bmcgo/functional/bmc_studio_action.py,sha256=Gg96UB8QtnhsaqSdMhXuS9fddzAFPhR6UYC
 bmcgo/functional/check.py,sha256=ReGN_8RRM6isX_r7XXEuHzkooh8pasky5_GpAml5d_g,8356
 bmcgo/functional/conan_index_build.py,sha256=Mp1fDpZVvecn5lUCsWZqq3mKSx9yu5pznQrDZr4Liuk,13443
 bmcgo/functional/config.py,sha256=ZQ-a9hegI0cV41iTo7t49ryBeUH4wPJ-qkVvWp8toV4,10824
-bmcgo/functional/csr_build.py,sha256=JTIvbjn08xvdo7aUhKW4giwPayojyIeQolT14SuwJRo,41146
+bmcgo/functional/csr_build.py,sha256=k6vEWuhrmTXTndMQX-RF6v9S7So-Gi4WWjoUYzh5IVA,42046
 bmcgo/functional/deploy.py,sha256=2NsxCpoZjL4jTyRpbIp20-EKKbQkQe-Hsm20uxHK2Xc,10677
 bmcgo/functional/diff.py,sha256=ygxeVFUwUX2a6zg8nWlxIchh_-ajtKpvAqLb8INe6YE,10562
 bmcgo/functional/fetch.py,sha256=hkuHDKyrfbEhvnLbZ8-funhXTkSrCY27WFnYBJFRJMY,10768
@@ -233,7 +233,7 @@ bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2Ba
 bmcgo/tasks/task_download_buildtools.py,sha256=QZpsrm2eaoJ0z5PkdSuHXg1n7L9qPz2s3XAVCnQi-hA,4292
 bmcgo/tasks/task_download_dependency.py,sha256=2AW4awv_njlTrKy11ygKWekFBXLyS18FLcws8cVXGz0,3169
 bmcgo/tasks/task_hpm_envir_prepare.py,sha256=Jkt5tu04NUpSuiKG1Iaei8fUloWYhwHwdXehj4PLwMA,4244
-bmcgo/tasks/task_packet_to_supporte.py,sha256=eaNtri3YQfXFBnceM1-2C_6AgMgrGxEj4xKXTgNRPH8,4100
+bmcgo/tasks/task_packet_to_supporte.py,sha256=5VSnC9typxiShCxt8YWWyBVojJ6MaXvgPHiIf6bObuA,4351
 bmcgo/tasks/task_prepare.py,sha256=K1cb_3lhclRkCYa2wgp5E2FMOd3pC7VHBnm_4L_nrRE,6704
 bmcgo/tasks/task_sign_and_pack_hpm.py,sha256=dLXTea5zfYg9UwYzhpl6o3eYd4Zg3vyB5GED4QcTvT0,2238
 bmcgo/tasks/conan/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
@@ -264,8 +264,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.59.dist-info/METADATA,sha256=42XLTEus73YQ00Rv-MmfEwoY7Cvt8ji1fMOB86l1g3A,1010
-openubmc_bingo-0.6.59.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.59.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.59.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.59.dist-info/RECORD,,
+openubmc_bingo-0.6.61.dist-info/METADATA,sha256=7ADg8Uy87Zcc4a4Hfx5l77VO9O2XLajh1R_UYIMyBZk,1010
+openubmc_bingo-0.6.61.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.61.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.61.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.61.dist-info/RECORD,,