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

bmcgo/tasks/task_build_conan.py

@@ -152,7 +152,7 @@ class CopyComponent(Process):
         if os.path.isdir(mdb_path):
             cmd = f"cp -dfr {mdb_path} {self.config.mdb_output}"
             self.work.run_command(cmd)
-        mds_path = os.path.join(self.package_folder, "usr/share/docs/openubmc")
+        mds_path = os.path.join(self.package_folder, "usr/share/doc/openubmc")
         if os.path.isdir(mds_path):
             cmd = f"cp -dfr {mds_path}/. {self.config.mdb_output}"
             self.work.run_command(cmd)

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

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=f-6NOvxJOnzyWXJ3Uh7FNKi9PrwcqPnv59VMa38sOs4,562
+bmcgo/__init__.py,sha256=WCeuHxskNJNexpFQY1v5EHAl1f6ysPef-7lxsGm9TfE,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -224,7 +224,7 @@ bmcgo/tasks/__init__.py,sha256=VapgzhPMmB7dzPIRohoVm1jjfVn_v97cYNCRmkxScaU,539
 bmcgo/tasks/download_buildtools_hm.py,sha256=f4UxStARc8Z8DnT_5O6ONajQ7P0sKyJ8brixr43fHVQ,5988
 bmcgo/tasks/misc.py,sha256=GK_bSDLGZW0FxywB2ICG1iIEz2y2QoCb1YQQk8SYOIA,711
 bmcgo/tasks/task.py,sha256=95nKxTe5PW3rfhpm5YFasPtmP8oCraeWJKq0D5mbl6A,18578
-bmcgo/tasks/task_build_conan.py,sha256=TqhJmpfQXyNGxfNR6FZijqopuAhZ0lfmOxjoQBLHSHc,53873
+bmcgo/tasks/task_build_conan.py,sha256=Si-8fIrQ_Vva6gw0kdLApEZY5cKt8Mt1C_8Ef4If61I,53872
 bmcgo/tasks/task_build_rootfs_img.py,sha256=jRw-psICpACRspQOJ4e6zatG1a63V7yTpajnBmRL59E,28937
 bmcgo/tasks/task_build_wbd_up.py,sha256=X9-0Qqad-s3mGfJBMeBQvfZ99KlWcgaMluDr_zv6Z-o,3122
 bmcgo/tasks/task_buildgppbin.py,sha256=epBxxrYFPgoTzpBgPzSRXcUs-ia_BJWsLGflylEJS7I,6614
@@ -235,7 +235,7 @@ bmcgo/tasks/task_download_dependency.py,sha256=2AW4awv_njlTrKy11ygKWekFBXLyS18FL
 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_prepare.py,sha256=K1cb_3lhclRkCYa2wgp5E2FMOd3pC7VHBnm_4L_nrRE,6704
-bmcgo/tasks/task_sign_and_pack_hpm.py,sha256=X8m1WAj3c0bKi2JAaumR81Qxv1FnFi0SrRL-l6vDRAo,1965
+bmcgo/tasks/task_sign_and_pack_hpm.py,sha256=dLXTea5zfYg9UwYzhpl6o3eYd4Zg3vyB5GED4QcTvT0,2238
 bmcgo/tasks/conan/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/tasks/conan/conanfile.py,sha256=MI6c2QNKixrkA5Tx4i9EKw7bZ20GVDIKgkaMwNHQKcg,1342
 bmcgo/utils/__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.57.dist-info/METADATA,sha256=l6bjg1OxYuCThuI4swY8dZLVDEpryVPWRlhk6BxpbHo,1010
-openubmc_bingo-0.6.57.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.57.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.57.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.57.dist-info/RECORD,,
+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,,