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

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

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=DX6yFzfahIAtXohICvEQ5Az3yw9BBmKcaaVBy7kWaXo,562
+bmcgo/__init__.py,sha256=43ixOvkIh39o4ZhQabt-Iqd-IW0mIERU1M3-k75tKt8,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -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=KVxiYeLtONpWe6Sh2l7hj09HD3NydrSTx3ycrpT6gLg,3457
 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.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,,
+openubmc_bingo-0.6.63.dist-info/METADATA,sha256=Cu1hBuatPipUUr2RecPDKy_Q3yClsDgiN6LnVJJ9IjA,1010
+openubmc_bingo-0.6.63.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.63.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.63.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.63.dist-info/RECORD,,