openubmc-bingo 0.6.60__py3-none-any.whl → 0.6.62__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.60'
+__version__ = '0.6.62'

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/test.py

@@ -877,7 +877,7 @@ class TestComp():
     def check_folder(self):
         test_package_folder = os.path.join(self.folder, "test_package")
         ut_path = os.path.join(self.folder, "test", "unit")
-        it_path = os.path.join(self.folder, "test", "intergration")
+        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

bmcgo/tasks/task_hpm_envir_prepare.py

@@ -13,6 +13,7 @@ import os
 import subprocess
 import time
 from multiprocessing import Process
+
 from bmcgo.tasks.task import Task
 from bmcgo import errors
 
@@ -27,13 +28,24 @@ class SignProcess(Process):
         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")
+            self.self_sign()
         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)
+            self.online_sign()
+
+    # 自签名函数，继承类可扩展，不能变更方法名，重要!!!
+    def self_sign(self):
+        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",
+        )
+
+    # 在线签名函数，继承类可扩展，不能变更方法名，重要!!!
+    def online_sign(self):
+        # bingo无需在线签名逻辑，仅占位满足后续流程即可
+        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):
@@ -45,6 +57,9 @@ class TarImageProcess(Process):
     def run(self):
         self.work.work_name = "tar_rootfs_image"
         self.work.chdir(self.config.work_out)
+        self.tar_image()
+
+    def tar_image(self):
         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")
 
@@ -116,4 +131,3 @@ class TaskClass(Task):
                     raise errors.BmcGoException(f"打包进程发生错误, 返回值: {tar.exitcode}")
                 break
             time.sleep(0.1)
-

{openubmc_bingo-0.6.60.dist-info → openubmc_bingo-0.6.62.dist-info}/METADATA

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

{openubmc_bingo-0.6.60.dist-info → openubmc_bingo-0.6.62.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=ny0a2iUY34db1tjNvG7JQ4o8ANmHJBphk9ou-Ry9Yk0,562
+bmcgo/__init__.py,sha256=AakrBEE0OLoYJqOtyMmj_oXuKZzZNxOMFT1yjxm-Bqc,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -174,8 +174,8 @@ bmcgo/component/component_helper.py,sha256=gB2N3eRH8gmWbYBHAV-ejD4bEhk71ZVeuXi46
 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=fJ1dHj69ZDVl5deo4YoJgIdQwTpByn5owWH0xuHdnhw,45816
-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
@@ -232,7 +232,7 @@ bmcgo/tasks/task_buildhpm_ext4.py,sha256=DBZnmU_eb14J0CW_wVoCc9VKnssFF1vXmRhLJQ6
 bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2BaRQkH7KP3zwJ6FI,5393
 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_hpm_envir_prepare.py,sha256=fG_5VAYF8x00VEes1RNBzkd1ucwMRQ_J7qrD-WUH7Ok,4597
 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
@@ -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.60.dist-info/METADATA,sha256=p7RBW5UNu1H48Mblh12ZVoQ_wMv18WmnLNjqcaTV-hg,1010
-openubmc_bingo-0.6.60.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.60.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.60.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.60.dist-info/RECORD,,
+openubmc_bingo-0.6.62.dist-info/METADATA,sha256=OBCy8TdKhZ1JnE_S2_xipqSKFs4awl-a_8TJqfFCOZ8,1010
+openubmc_bingo-0.6.62.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.62.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.62.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.62.dist-info/RECORD,,