openubmc-bingo 0.5.242__py3-none-any.whl → 0.5.243__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.5.242'
+__version__ = '0.5.243'

bmcgo/bmcgo_config.py

@@ -72,6 +72,7 @@ class BmcgoConfig(object):
         self.bmcgo_local_config = configparser.ConfigParser()
         self.bmcgo_config_list = {}
         self._bmcgo_config_load()
+        self.conf_path = os.path.join(self.bmcgo_path, "cli", "config.yaml")
 
     @functools.cached_property
     def partner_mode(self):

bmcgo/cli/cli.py

@@ -411,8 +411,6 @@ class Command(object):
                 log.info(f"导入模块 {module_name} 失败")
 
     def _gen_command_group_base(self):
-        if not self.bconfig.partner_mode:
-            self.inte_cmds[misc.ANALYSIS] = misc.ANALYSIS
         self._load_functional(self.bconfig.functional_path)
 
     def _get_command_group(self):

bmcgo/cli/config.yaml

@@ -0,0 +1,9 @@
+comp_type:
+  - conan_index
+  - component
+  - manifest
+dt_dependencies:
+  dtframeforlua: dtframeforlua
+  luaunit: luaunit/3.2
+  luacov: luacov/[>=0.16.2]
+  luafilesystem: luafilesystem/1.8.0.B022

bmcgo/component/deploy.py

@@ -12,6 +12,7 @@
 import os
 import shutil
 import stat
+import yaml
 
 from mako.lookup import TemplateLookup
 
@@ -25,12 +26,6 @@ from bmcgo import misc
 log = Logger("deploy")
 
 cwd_script = os.path.split(os.path.realpath(__file__))[0]
-DT_DEPENDENCIES = {
-    "dtframeforlua": "dtframeforlua", # 目前定义在部分组件的service.json
-    "luaunit": "luaunit/3.2",
-    "luacov": "luacov/[>=0.16.2]",
-    "luafilesystem": "luafilesystem/1.8.0.B022",
-}
 
 
 class DeployComp():
@@ -45,11 +40,14 @@ class DeployComp():
         user_channel = ComponentHelper.get_user_channel(self.info.stage)
         # DT专用的依赖，只在部署时添加
         dependencies = []
-        lua_run_deps = [DT_DEPENDENCIES.get("luaunit")]
+        with open(self.bconfig.conf_path, "r") as fp:
+            config = yaml.safe_load(fp)
+        dt_dependencies = config.get("dt_dependencies", {})
+        lua_run_deps = [dt_dependencies.get("luaunit")]
         # 只有lua需要添加依赖
         if not os.path.isdir("test_package") and self.info.coverage:
-            lua_run_deps.append(DT_DEPENDENCIES.get("luacov"))
-            lua_run_deps.append(DT_DEPENDENCIES.get("luafilesystem"))
+            lua_run_deps.append(dt_dependencies.get("luacov"))
+            lua_run_deps.append(dt_dependencies.get("luafilesystem"))
         for dep in lua_run_deps:
             for build_dep in self.info.build_dependencies:
                 if build_dep.startswith(dep.split("/", -1)[0]):

bmcgo/target/personal.yml

@@ -21,6 +21,10 @@ subworks:
     klass: bmcgo.tasks.task_build_conan
     wait:
       - work.build.download
+  - name: work.build_wbd_up
+    klass: bmcgo.tasks.task_build_wbd_up
+    wait:
+      - work.build.conan
   - name: work.task_build_rootfs_img
     klass: bmcgo.tasks.task_build_rootfs_img
     subworks:
@@ -46,6 +50,7 @@ subworks:
         ignore_not_exist: true
     wait:
       - work.build.conan
+      - work.build_wbd_up
       - task_download_dependency
   - name: work.create_interface_config
     klass: bmcgo.tasks.task_create_interface_config

bmcgo/target/publish.yml

@@ -15,6 +15,10 @@
   klass: bmcgo.tasks.task_build_conan
   wait:
     - work.build.download
+- name: work.build_wbd_up
+  klass: bmcgo.tasks.task_build_wbd_up
+  wait:
+    - work.build.app
 - name: work.task_build_rootfs_img
   klass: bmcgo.tasks.task_build_rootfs_img
   subworks:
@@ -42,4 +46,5 @@
         - work.task_build_qemu_rootfs
       ignore_not_exist: true
   wait:
+    - work.build_wbd_up
     - work.build.app

bmcgo/tasks/task_build_wbd_up.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+# coding: utf-8
+# Copyright (c) 2025 Huawei Technologies Co., Ltd.
+# openUBMC is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#         http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+import os
+import shutil
+
+from bmcgo.tasks.task import Task
+
+
+class TaskClass(Task):
+    def __init__(self, config, work_name=""):
+        super(TaskClass, self).__init__(config, work_name=work_name)
+        self.wbd_build_dir = os.path.join(self.config.build_path, "wbd_build_dir")
+
+    def get_wbd_file_config(self):
+        wbd_up_file_config = None
+        if self.config.tosupporte_code:
+            wbd_config_path = f"tosupporte/{self.config.tosupporte_code}/wbd_up_files"
+            wbd_up_file_config = self.get_manufacture_config(wbd_config_path)
+        elif self.config.manufacture_code:
+            wbd_config_path = f"manufacture/{self.config.manufacture_code}/wbd_up_files"
+            wbd_up_file_config = self.get_manufacture_config(wbd_config_path)
+        else:
+            pass
+            
+        wbd_up_file_config = wbd_up_file_config or self.get_manufacture_config("wbd_up_files")
+        return wbd_up_file_config
+
+
+    def generate_wbd_package(self, wbd_up_file_config):
+        self.chdir(self.wbd_build_dir)
+
+        if "repo" in wbd_up_file_config and "tag" in wbd_up_file_config:
+            repo = wbd_up_file_config.get("repo")
+            tag = wbd_up_file_config.get("tag")
+            if not repo.startswith("https"):
+                self.info("建议使用 https 协议的仓库地址")
+            self.run_command(f"git clone {repo} -b {tag} --depth=1")
+            
+        # 复制manifest.yml中配置的文件到build目录
+        files = wbd_up_file_config.get("files")
+        self.copy_manifest_files(files)
+        
+        # 约定压缩打包wbd_up_file目录
+        self.run_command(f"tar --format=gnu -zcvf wbd_up_file.tar.gz wbd_up_file")
+        rootfs_wbd_path = os.path.join(self.config.rootfs_path, "opt/bmc/white_branding")
+        self.run_command(f"mkdir -p {rootfs_wbd_path}", sudo=True)
+        self.run_command(f"cp -f wbd_up_file.tar.gz {rootfs_wbd_path}", sudo=True)
+
+    def run(self):
+        wbd_up_file_config = self.get_wbd_file_config()
+        if not wbd_up_file_config:
+            self.info("未在manifest.yml中找到 wbd_up_files 配置, 跳过白牌打包")
+            return
+
+        shutil.rmtree(self.wbd_build_dir, ignore_errors=True)
+        os.makedirs(self.wbd_build_dir, exist_ok=True)
+
+        self.info(f"----打包 {self.config.board_name} wbd_up_file.tar.gz 到BMC hpm包中 ------------> [开始]")
+        self.generate_wbd_package(wbd_up_file_config)
+        self.info(f"----打包  {self.config.board_name}wbd_up_file.tar.gz 到BMC hpm包中 ----------> [结束]")

{openubmc_bingo-0.5.242.dist-info → openubmc_bingo-0.5.243.dist-info}/METADATA

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

{openubmc_bingo-0.5.242.dist-info → openubmc_bingo-0.5.243.dist-info}/RECORD

@@ -1,13 +1,14 @@
-bmcgo/__init__.py,sha256=-zMsR8qKvI9uoI1hptUjoq3NpnC3IvYhDRauW2t6Ww4,562
+bmcgo/__init__.py,sha256=j61yD8530dkhtOSYxj6bRJgrYaVdQ8HGZyRhYPdFVf0,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
-bmcgo/bmcgo_config.py,sha256=q8JtOHFVB5io-VHbUiazpidN1fkLHxDAagGuIl60mb8,7308
+bmcgo/bmcgo_config.py,sha256=DoFzuYJjqYLJ7rVmAq3kNjj5ZQZ931oLQTry8uovF3E,7385
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
 bmcgo/frame.py,sha256=OUIlplOGD9NXHdubhXSfmR4s5e29AsMyLUkkiWrdRsg,10378
 bmcgo/logger.py,sha256=4TPOkBA80Z00rSCOdEv_WkwE5Kr3HCDt-HuVe9waXck,6645
 bmcgo/misc.py,sha256=VukODl7BdMZz8sZyQ5o0wHj9ixJfPZmmeLuDHoCiSBg,3430
 bmcgo/worker.py,sha256=-KxZIW4dziej5wCY-v5XEmtY-CDCL2-FO3VHFovlFbM,15228
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=hN5cQJuGorIgo3ZlPAQWGH3n7GLwQiqMudhK5cujHC4,21620
+bmcgo/cli/cli.py,sha256=pqAkvjrk4F7x58-fYeGn0TydT3szZ2pM7guYwDoU2Ew,21520
+bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
 bmcgo/codegen/c/__init__.py,sha256=tmBG8c6sfxgIj__lyyU5mydWeKBdqbDuIQkLI38lwjI,522
 bmcgo/codegen/c/annotation.py,sha256=c4NiF6b9R-HbwbBGNhnH5zrfcPAYBkhWq30PT9CKzw4,1987
@@ -156,7 +157,7 @@ bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,5
 bmcgo/component/build.py,sha256=LG7NwlEctiKaMhbluUV-8vMx4efFFkbwTPuAYxeNWkw,9621
 bmcgo/component/component_dt_version_parse.py,sha256=KyrfyjbrszU-hhG1Hr6TzKuSabmGIK51b_3KuVBv5-g,14139
 bmcgo/component/component_helper.py,sha256=VmLsmvWTJT5861ec70VC0lEIPZI9njMtn3Zo3L6hamM,4146
-bmcgo/component/deploy.py,sha256=PBriI_P4_gfhXH6pP6AXhfTbaJTLNTDJ9dI7rYwRmgs,4622
+bmcgo/component/deploy.py,sha256=EO0hSZzXYPG-1SQOhNMkqLQWSeqkU3RxKemsqfWrgBE,4569
 bmcgo/component/gen.py,sha256=RVWfwiUWXyqbTW5Xj5rtVD7SA05D4sXf5Ea0T7gCfO0,7234
 bmcgo/component/package_info.py,sha256=5xh3yCXXcuCpEY3j_81K3639IQLx8idnAoxLwtQ5npE,10479
 bmcgo/component/test.py,sha256=kC8QsM3PypcDDy9VhBNQ4iutyBbPztMtlFHGY8a82FE,43332
@@ -199,14 +200,15 @@ bmcgo/ipmigen/template/ipmi.c.mako,sha256=LNrJmXQut4923aQkkkuHFp9tTR9ExrBi0WYfxV
 bmcgo/ipmigen/template/ipmi.h.mako,sha256=veZ42lJq4hljyNH5uL_yesHpoANF3pprTL1VwTlflqs,2006
 bmcgo/target/app.yml,sha256=OaCk1YntS6h_cKUt8rvJ7fkqXMFjK5v4Iu2Nhx66ZFY,469
 bmcgo/target/install_sdk.yml,sha256=jgE_pkkIfiSIoDI91qxoHHjXFx9zcBUDQD-FfDaxcZg,540
-bmcgo/target/personal.yml,sha256=4sQyorfQF65fihzF_8CFST6Koy06a-9-W-wrz5IVmFA,1823
-bmcgo/target/publish.yml,sha256=4V6oWdMkJP_hmqiTnOH7EM5GTAS-nNzSUCfTSaxYmRA,1497
+bmcgo/target/personal.yml,sha256=o2PEQIcHe7v8J5-WHiQlgTEgiisQx_vCkgLlKDLkzh4,1953
+bmcgo/target/publish.yml,sha256=WvaJAUZ0_6CMV3O1p1t6dagHe-DdLcXqLxKP11_ki1E,1615
 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=e7GL0fh4vXwhwq5Hv-SixCw-lbNPJtdivhUmvHrfWI8,15788
 bmcgo/tasks/task_build_conan.py,sha256=3BtapZXt09cKWcR_Wa8fXhrQDCvKWQtYjxG5RSC8F-U,32823
 bmcgo/tasks/task_build_rootfs_img.py,sha256=uFrMfrpaAHB_2QQdEo46P8TgFrGMTG-xfZUlxzJLSQ0,30443
+bmcgo/tasks/task_build_wbd_up.py,sha256=VlmjKX17L6fSoFRAL4LppzufXFWlMXYh1y_iGeTazo8,3122
 bmcgo/tasks/task_buildgppbin.py,sha256=Xjfw6j8OsyS_XRiOt4vqIK1rDQ4sNKG__eurDu-M9bo,6341
 bmcgo/tasks/task_buildhpm_ext4.py,sha256=DBZnmU_eb14J0CW_wVoCc9VKnssFF1vXmRhLJQ6kR28,3482
 bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2BaRQkH7KP3zwJ6FI,5393
@@ -236,8 +238,8 @@ bmcgo/utils/installations/version_util.py,sha256=xyubh5rwD8_xqLgL8mL5ecz83T98M94
 bmcgo/utils/installations/install_plans/bingo.yml,sha256=S7h9dDNQYGkmC0h3tVJIR53iLB99oV1v6FUeFnXqDks,286
 bmcgo/utils/installations/installers/apt_installer.py,sha256=vvKEN6R7GWd8N5axsm0FFDMMzR7UhtOu_N_Tk3HcLmA,6741
 bmcgo/utils/installations/installers/pip_installer.py,sha256=hZtTB5KyhNp3pquBl0k5Xjp5_0RvrG_0jwnG9yGDXmk,1869
-openubmc_bingo-0.5.242.dist-info/METADATA,sha256=xKxy8toQckcQfnYYVFjMATtbV9VHNB1YIdHij5hKvZo,904
-openubmc_bingo-0.5.242.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.5.242.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.5.242.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.5.242.dist-info/RECORD,,
+openubmc_bingo-0.5.243.dist-info/METADATA,sha256=tQwFvGnRA9J7suBvS521fEC8vowrq6C6fS6t6fH_31c,904
+openubmc_bingo-0.5.243.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.5.243.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.5.243.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.5.243.dist-info/RECORD,,