openubmc-bingo 0.5.269__py3-none-any.whl → 0.5.272__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.269'
+__version__ = '0.5.272'

bmcgo/codegen/lua/templates/apps/ipmi.lua.mako

@@ -46,7 +46,7 @@ ${ClassName}.${ipmi['name']} = {
     encode = ${utils_py.format_value(render_utils.get_option(ipmi, 'encode'), '')},
     req = msg.${ipmi['name']}Req,
     rsp = msg.${ipmi['name']}Rsp,
-% if version >= 6:
+% if version >= 3:
     manufacturer = ${utils_py.format_value(render_utils.get_manufacturer(ipmi), '')},
 % endif
     sysLockedPolicy = '${render_utils.get_sys_locked_policy(ipmi)}'

bmcgo/component/analysis/smc_dfx_whitelist.json

@@ -1,11 +1,12 @@
 [
     {
-        "UID": "00000001020302031825",
-        "Scanners": [
-            {
-                "SmcAddress": 96,
-                "ScannerOffset": 1006636292
-            }
-        ]
+        "ChipType": "Smc",
+        "ChipAddress": 96,
+        "ScannerOffset": 1006636292
+    },
+    {
+        "ChipType": "Chip",
+        "ChipAddress": 212,
+        "ScannerOffset": 39
     }
 ]

bmcgo/component/analysis/sr_validation.py

@@ -16,7 +16,7 @@ import stat
 import re
 from collections import defaultdict
 from pathlib import Path
-from typing import Dict, List
+from typing import Dict, List, Set, Tuple
 from colorama import Fore, Style
 from bmcgo.logger import Logger
 
@@ -193,7 +193,7 @@ class SrValidate(SrParser):
         self.is_sr_repo = False
         self.is_product_sr_repo = False
         self.check_repo_type()
-        self.smc_dfx_whitelist: Dict[str, List[Dict[str, int]]] = defaultdict(list)
+        self.smc_dfx_whitelist: Dict[str, Set[Tuple[int, int]]] = defaultdict(set)
         self.load_smc_dfx_whitelist()
 
     @staticmethod
@@ -207,25 +207,6 @@ class SrValidate(SrParser):
                     continue
                 hardware_sr_objects[obj_name][prop_name] = prop_data
 
-    @staticmethod
-    def get_uid(sr_objects: Dict[str, Dict]):
-        tianchi_uid = ""
-        for obj_name, obj_data in sr_objects.items():
-            class_name = SrParser.get_class_name(obj_name)
-            uid = obj_data.get("UID")
-            if class_name == 'SRUpgrade' and uid:
-                # 优先返回SRUpgrade对象下配置的UID
-                return uid
-            tianchi_data = obj_data.get("bmc.dev.Board.TianChi")
-            if isinstance(tianchi_data, dict) and not tianchi_uid:
-                inner_uid = tianchi_data.get("UID")
-                if inner_uid:
-                    tianchi_uid = inner_uid
-                elif uid:
-                    tianchi_uid = uid
-        # 找不到SRUpgrade对象下配置的UID后，再返回按设备树方案查找的UID
-        return tianchi_uid
-
     @staticmethod
     def get_chip_ref(obj_data: Dict):
         value = obj_data.get(CHIP_KEY)
@@ -253,7 +234,11 @@ class SrValidate(SrParser):
             with open(whitelist_file, 'r') as file_descriptor:
                 content = json.load(file_descriptor)
             for item in content:
-                self.smc_dfx_whitelist[item.get("UID")] = item.get("Scanners")
+                chip_type = item.get("ChipType")
+                chip_address = item.get("ChipAddress")
+                scanner_offset = item.get("ScannerOffset")
+                if isinstance(chip_type, str) and isinstance(chip_address, int) and isinstance(scanner_offset, int):
+                    self.smc_dfx_whitelist[chip_type].add((chip_address, scanner_offset))
         except Exception as e:
             log.error('smc_dfx_whitelist.json 文件解析失败: %s', e)
 
@@ -354,18 +339,15 @@ class SrValidate(SrParser):
                 self.issues_report[relpath].add(("error", f"器件'{obj}'有多条上行总线"))
             chips.add(obj)
 
-    def match_smc_dfx_whitelist(self, file_objs: Dict[str, Dict], uid: str, chip: str, scanner_data: Dict):
-        if chip not in file_objs or uid not in self.smc_dfx_whitelist:
+    def match_smc_dfx_whitelist(self, file_objs: Dict[str, Dict], chip: str, scanner_data: Dict):
+        if chip not in file_objs:
             return False
         chip_data = file_objs.get(chip)
-        smc_address = chip_data.get("Address")
+        chip_address = chip_data.get("Address")
         scanner_offset = scanner_data.get("Offset")
-        if not smc_address or not scanner_offset:
+        if not chip_address or not scanner_offset:
             return False
-        for item in self.smc_dfx_whitelist.get(uid):
-            if item.get("SmcAddress") == smc_address and item.get("ScannerOffset") == scanner_offset:
-                return True
-        return False
+        return (chip_address, scanner_offset) in self.smc_dfx_whitelist[SrParser.get_class_name(chip)]
 
     def check_smc_dfx_info(self, relpath: str):
         smc_dfx_info_objs = {}
@@ -376,12 +358,11 @@ class SrValidate(SrParser):
         if not smc_dfx_info_objs:
             return
 
-        uid = self.get_uid(self.sr_objs[relpath])
         for obj_name, obj_data in self.sr_objs[relpath].items():
             chip = self.get_chip_ref(obj_data)
             condition = self.get_class_name(obj_name) == "Scanner" and obj_name != "Scanner_PowerGood" \
                 and chip and chip in smc_dfx_info_objs
-            condition = condition and not self.match_smc_dfx_whitelist(self.sr_objs[relpath], uid, chip, obj_data)
+            condition = condition and not self.match_smc_dfx_whitelist(self.sr_objs[relpath], chip, obj_data)
             if not condition:
                 continue
             smc_dfx_info_obj_name, smc_dfx_info_obj_data = smc_dfx_info_objs.get(chip)

bmcgo/ipmigen/template/cmd.c.mako

@@ -351,7 +351,7 @@ static void ${cmd.name}_start(void)
 % if version >= 3:
     IpmiCmdInfo_set_Sensitive(obj, ${"TRUE" if cmd.sensitive else "FALSE"});
 % endif
-% if version >= 6:
+% if version >= 3:
     gint32 value[2] = ${cmd.manufacturer};
     IpmiCmdInfo_set_Manufacturer(obj, 2, value);
 % endif

bmcgo/tasks/task_build_rootfs_img.py

@@ -66,7 +66,8 @@ class TaskClass(Task):
         self.rtos_datafs = f"{self.rtos_rootfs}/data"
         # 镜像挂载点
         self.mnt_datafs = f"{self.buildimg_dir}/mnt_datafs"
-        self.tools.check_path(self.mnt_datafs)
+        self.run_command(f"rm -rf {self.mnt_datafs}", sudo=True)
+        self.run_command(f"mkdir {self.mnt_datafs}", sudo=True)
         self.tools.check_path(self.rtos_rootfs)
 
     def component_cust_conf(self):
@@ -482,6 +483,7 @@ class TaskClass(Task):
 
         # ! 制作datafs img镜像，供work_buildpkg_ext4.py使用
         datafs_mount_path = f"{self.config.build_path}/mnt_datafs/"
+        self.run_command(f"rm -rf {datafs_mount_path}", sudo=True)
         self.run_command(f"mkdir -p {datafs_mount_path}", sudo=True)
 
         # 复制所有文件到挂载目录

bmcgo/worker.py

@@ -253,56 +253,61 @@ class WorkerScheduler(Process):
         if not ret:
             log.debug(f"等待任务 {self.work_name} 类 {self.klass} 发生错误")
             return -1
-        target_config = self.work.get("target_config")
-        config.deal_conf(target_config)
-        # bmcgo的任务类名固定为TaskClass
-        work_class = self.load_class()
-        # 如果未指定类时，不需要执行
-        if work_class is not None:
-            work_x = work_class(config, work_name)
-            # work配置项和target配置项
-            work_config = self.work.get("work_config")
-            work_x.deal_conf(work_config)
-            ret = ws_client.set_if_not_exist(self.target_name, work_name, "Running")
-            self.perf.add_data(work_name, "running")
-            if not args.debug_frame and ret:
-                # 创建进程并且等待完成或超时
-                ret = work_x.run()
-                if ret is not None and ret != 0:
-                    return -1
-            elif not args.debug_frame and not ret:
-                # 不需要创建进程，等待任务执行完成即可
-                wait_list = []
-                wait_list.append(work_name)
-                ret = wait_finish(self.target_name, wait_list, work_name)
-                if not ret:
-                    log.debug(f"等待任务 {self.work_name} 类 {self.klass} 发生错误")
-                    return -1
-
-            log.debug(f"任务 {work_name} 开始安装步骤")
-            if not args.debug_frame:
-                ret = work_x.install()
-                if ret is not None and ret != 0:
-                    return -1
-            self.perf.add_data(work_name, "finish")
-
-        # 创建子任务
-        ret = exec_works(self.target_name, self.work.get("subworks"), work_name, self.perf, self.config, self.args)
-        if not ret:
-            ws_client.set(self.target_name, self.work_name, TASK_STATUS_FAILED, ignore_error=True)
-            log.error(f"运行子任务 {self.work_name} 类 {self.klass}失败")
-            return -1
-        # 创建include_target子任务
-        target_include = self.work.get("target_include")
-        if target_include:
-            ret = create_target_scheduler(work_name, target_include, self.perf, self.config, self.args)
+        try:
+            log.success(f"任务 {work_name} 开始")
+            target_config = self.work.get("target_config")
+            config.deal_conf(target_config)
+            # bmcgo的任务类名固定为TaskClass
+            work_class = self.load_class()
+            # 如果未指定类时，不需要执行
+            if work_class is not None:
+                work_x = work_class(config, work_name)
+                # work配置项和target配置项
+                work_config = self.work.get("work_config")
+                work_x.deal_conf(work_config)
+                ret = ws_client.set_if_not_exist(self.target_name, work_name, "Running")
+                self.perf.add_data(work_name, "running")
+                if not args.debug_frame and ret:
+                    # 创建进程并且等待完成或超时
+                    ret = work_x.run()
+                    if ret is not None and ret != 0:
+                        return -1
+                elif not args.debug_frame and not ret:
+                    # 不需要创建进程，等待任务执行完成即可
+                    wait_list = []
+                    wait_list.append(work_name)
+                    ret = wait_finish(self.target_name, wait_list, work_name)
+                    if not ret:
+                        log.debug(f"等待任务 {self.work_name} 类 {self.klass} 发生错误")
+                        return -1
+
+                log.debug(f"任务 {work_name} 开始安装步骤")
+                if not args.debug_frame:
+                    ret = work_x.install()
+                    if ret is not None and ret != 0:
+                        return -1
+                self.perf.add_data(work_name, "finish")
+
+            # 创建子任务
+            ret = exec_works(self.target_name, self.work.get("subworks"), work_name, self.perf, self.config, self.args)
             if not ret:
                 ws_client.set(self.target_name, self.work_name, TASK_STATUS_FAILED, ignore_error=True)
-                log.error(f"创建计划表 {target_include} 失败")
+                log.error(f"运行子任务 {self.work_name} 类 {self.klass}失败")
                 return -1
-        log.success(f"任务 {work_name} 完成")
-        ws_client.set(self.target_name, self.work_name, "Done")
-        return 0
+            # 创建include_target子任务
+            target_include = self.work.get("target_include")
+            if target_include:
+                ret = create_target_scheduler(work_name, target_include, self.perf, self.config, self.args)
+                if not ret:
+                    ws_client.set(self.target_name, self.work_name, TASK_STATUS_FAILED, ignore_error=True)
+                    log.error(f"创建计划表 {target_include} 失败")
+                    return -1
+            log.success(f"任务 {work_name} 完成")
+            ws_client.set(self.target_name, self.work_name, "Done")
+            return 0
+        except Exception as exc:
+            log.error(f"任务 {work_name} 执行失败, {str(exc)}")
+            raise errors.BmcGoException(f"任务 {work_name} 执行失败") from exc
 
 
 class Worker():

{openubmc_bingo-0.5.269.dist-info → openubmc_bingo-0.5.272.dist-info}/METADATA

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

{openubmc_bingo-0.5.269.dist-info → openubmc_bingo-0.5.272.dist-info}/RECORD

@@ -1,11 +1,11 @@
-bmcgo/__init__.py,sha256=2GL1TNEiSzmnaRRvVISSo2edYxaiqizlM8XEtha_GIg,563
+bmcgo/__init__.py,sha256=DlfF7Ejd_JSfShXVP-6tqxiwWr3mLrm5BaoI26J5HBY,563
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=zPghH-W8vNK1bAc5PjfwnWzkHYT499PlGbhUWhPKT5U,10888
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
 bmcgo/frame.py,sha256=iUZSd3Pj7T4yDZYX7A4DeaV9dnmJqOTjMIiJMmL9zfM,10427
 bmcgo/logger.py,sha256=4TPOkBA80Z00rSCOdEv_WkwE5Kr3HCDt-HuVe9waXck,6645
 bmcgo/misc.py,sha256=KNO1PX54UnxBpvT-4Y5BKHSSeJrmDJaWnUwVhfGquu0,4259
-bmcgo/worker.py,sha256=-KxZIW4dziej5wCY-v5XEmtY-CDCL2-FO3VHFovlFbM,15228
+bmcgo/worker.py,sha256=hEzgS9_dZczjkWylxraqo6fvWde1aKndRiINNzq6xBM,15675
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/cli/cli.py,sha256=pqAkvjrk4F7x58-fYeGn0TydT3szZ2pM7guYwDoU2Ew,21520
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
@@ -113,7 +113,7 @@ bmcgo/codegen/lua/templates/apps/entry.lua.mako,sha256=vedgTAr6Y9AIn69C_1qb5kzKf
 bmcgo/codegen/lua/templates/apps/feature.lua.mako,sha256=c6gZ4fc62GG2Eg15UitkHVHE9bEq7qceOIwIsZ6AOtk,1105
 bmcgo/codegen/lua/templates/apps/generate_route.mako,sha256=1T0ViRtA-m4MaXyv4vyGj-okc3tPsChdL205FIwTgoI,716
 bmcgo/codegen/lua/templates/apps/impl_feature.lua.mako,sha256=lmb99UUocc7lKUMMl70RjfOjhkQCl7EZBGgqw-F6pBE,3255
-bmcgo/codegen/lua/templates/apps/ipmi.lua.mako,sha256=ctADHdoyu1h1Oeceh4W8OC837zYiLsc-jRNSPn-A8GI,3834
+bmcgo/codegen/lua/templates/apps/ipmi.lua.mako,sha256=xzsmOvc1XHILCNSW6NyV5OPdbUzsW4focMR3Hf9I2D8,3834
 bmcgo/codegen/lua/templates/apps/ipmi_cmd.lua.mako,sha256=om0Iw87ZunwFq_WZM_IyDVaj-7S7wTW9KZdowzQeRrw,408
 bmcgo/codegen/lua/templates/apps/ipmi_message.lua.mako,sha256=nNwKm3SI_5fFFlfA92KlWCq5LgI4CQChmAH3Y2YTd5A,957
 bmcgo/codegen/lua/templates/apps/local_db.lua.mako,sha256=CxyeW41Oo8G7PsRpO-k5a0ios1Y5m-DSRWKjfhNvI98,8408
@@ -182,8 +182,8 @@ bmcgo/component/analysis/dep_node.py,sha256=DSB30uim1Qrjs0zuphz0JXetP0ECBC7rzCEl
 bmcgo/component/analysis/intf_deps.py,sha256=IlcPixdaBpXpb6U4M-I1hRRGHCg5SCUg07V6kAosacE,7382
 bmcgo/component/analysis/intf_validation.py,sha256=zp_LiiJYYP8Y0lsFISX1KLY172q-qEOz0nFuQ--uPFQ,11131
 bmcgo/component/analysis/rule.py,sha256=xvntmvFdGa0J8WBlrHDdJ5bcl3jr4pXezR3KKvOg4Ag,7549
-bmcgo/component/analysis/smc_dfx_whitelist.json,sha256=dy_6-FddhG6UY7D1KUCW3Vme27eEmxpOLHefsCM0-rQ,192
-bmcgo/component/analysis/sr_validation.py,sha256=i1mlJb_D7RqE510LSAcCW81K1VUmZ7oSmLiMfUgdSJI,15598
+bmcgo/component/analysis/smc_dfx_whitelist.json,sha256=ur8WLSSDM696_PtbSOYciMV50TzbUgP2voVt_QbTCw0,202
+bmcgo/component/analysis/sr_validation.py,sha256=OrgPPjlOoLgRQyD_J6VZXAY0I6gtqGVOAhpGj0IY11Q,14876
 bmcgo/component/coverage/__init__.py,sha256=ZgUEyI86FTlOdBzcuTzz7UqTtfWcz416Gx4BCqcQlhA,557
 bmcgo/component/coverage/c_incremental_cov_report.template,sha256=FPhK1DZtmWsjDxa32R1ViH3IGCtNHcx0zFfgRo0s2nI,1576
 bmcgo/component/coverage/incremental_cov.py,sha256=tkeGpWfXXkipeDTEB9bS_p2S60rL_Eh0AWQbnSwHlK0,16803
@@ -209,7 +209,7 @@ bmcgo/functional/upgrade.py,sha256=HgTtUYtntuRcsO9qb1ciBvZ2gwyHrd0snyH7gjPKA6o,3
 bmcgo/ipmigen/__init__.py,sha256=xrppKUuQkt1jTqnr6gHWiWeEyUMFJeiZxcA7Hx9XXUo,789
 bmcgo/ipmigen/ctype_defination.py,sha256=PmkKRWTvmVQsZ-njio16ayXpsyFhC6le9Tu0baWU-xw,3179
 bmcgo/ipmigen/ipmigen.py,sha256=SZWoylTM-Tp4KSOQyfHidMjhhIzp4WIa40oxcrFfKB8,14506
-bmcgo/ipmigen/template/cmd.c.mako,sha256=5avKDLnEw0PscXZpj0Da0y7GcwQ2Q4lBy-yofw1BJIk,13955
+bmcgo/ipmigen/template/cmd.c.mako,sha256=wqfIFXnmRIQ_UtlJjAVMOjjjIXz8E5xEJMFyw7ompIU,13955
 bmcgo/ipmigen/template/ipmi.c.mako,sha256=LNrJmXQut4923aQkkkuHFp9tTR9ExrBi0WYfxVLTykU,696
 bmcgo/ipmigen/template/ipmi.h.mako,sha256=veZ42lJq4hljyNH5uL_yesHpoANF3pprTL1VwTlflqs,2006
 bmcgo/target/app.yml,sha256=OaCk1YntS6h_cKUt8rvJ7fkqXMFjK5v4Iu2Nhx66ZFY,469
@@ -221,7 +221,7 @@ bmcgo/tasks/download_buildtools_hm.py,sha256=f4UxStARc8Z8DnT_5O6ONajQ7P0sKyJ8bri
 bmcgo/tasks/misc.py,sha256=GK_bSDLGZW0FxywB2ICG1iIEz2y2QoCb1YQQk8SYOIA,711
 bmcgo/tasks/task.py,sha256=n7EhquD3FQeT8LHk0tREKOG9t1BcbMge_TY6ekGFydk,17064
 bmcgo/tasks/task_build_conan.py,sha256=nQt4VyK4QHh2u4JbM8kfK9WBVIMGKI18S2NPg9orlvQ,32962
-bmcgo/tasks/task_build_rootfs_img.py,sha256=PzaW_CyhJFnoWqFUtApvWYvyg4GBeQAlCaAb-RGWlYI,29060
+bmcgo/tasks/task_build_rootfs_img.py,sha256=JKEvldJnLWu2IdVSntuVowocQwdVtBQUpxzhplYauPI,29209
 bmcgo/tasks/task_build_wbd_up.py,sha256=X9-0Qqad-s3mGfJBMeBQvfZ99KlWcgaMluDr_zv6Z-o,3122
 bmcgo/tasks/task_buildgppbin.py,sha256=Xjfw6j8OsyS_XRiOt4vqIK1rDQ4sNKG__eurDu-M9bo,6341
 bmcgo/tasks/task_buildhpm_ext4.py,sha256=DBZnmU_eb14J0CW_wVoCc9VKnssFF1vXmRhLJQ6kR28,3482
@@ -254,8 +254,8 @@ bmcgo/utils/installations/version_util.py,sha256=dOwvLZ7iOmnzSeyD6_pRm7NS7I13Um5
 bmcgo/utils/installations/install_plans/bingo.yml,sha256=Zw1HnAyNJdEwkE3fnd-_GCe9bwv1m6bmMlaQTJXaFa8,210
 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.5.269.dist-info/METADATA,sha256=uTQ1K2KRlGKXgygeh-E1vpUs5QK45ySqEbQ4854KMoo,925
-openubmc_bingo-0.5.269.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.5.269.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.5.269.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.5.269.dist-info/RECORD,,
+openubmc_bingo-0.5.272.dist-info/METADATA,sha256=IpWk_uqNBVhPkTRiZqbogAdFspHNvwzfIlxap7vWcH8,925
+openubmc_bingo-0.5.272.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.5.272.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.5.272.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.5.272.dist-info/RECORD,,