openubmc-bingo 0.5.275__py3-none-any.whl → 0.5.277__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.275'
+__version__ = '0.5.277'

bmcgo/functional/csr_build.py

@@ -35,6 +35,7 @@ from bmcgo import errors
 from bmcgo.misc import CommandInfo
 from bmcgo.utils.tools import Tools
 from bmcgo.utils.buffer import Buffer
+from bmcgo.utils.merge_csr import Merger
 from bmcgo.bmcgo_config import BmcgoConfig
 from bmcgo.functional.simple_sign import BmcgoCommand as SimpleSign
 
@@ -205,6 +206,8 @@ class BmcgoCommand:
         self.target_dir = None
         self.eeprom_sign_strategy = None
         self.hpm_sign_strategy = None
+        self.tmp_dir = None
+        self.merger = Merger(self.output_path)
 
     @staticmethod
     def get_oem_data(dir_path: str, comp_name: str):
@@ -294,6 +297,9 @@ class BmcgoCommand:
 
     def run(self):
         self.check_args()
+        tmp = tempfile.TemporaryDirectory()
+        self.tmp_dir = tmp.name
+        self.merger.update_tmp_dir(self.tmp_dir)
         if not os.path.exists(self.output_path):
             raise Exception(f"输出路径{self.output_path}不存在")
         sr_make_options_list = []
@@ -338,6 +344,8 @@ class BmcgoCommand:
         finally:
             if os.path.exists(self.work_dir):
                 shutil.rmtree(self.work_dir)
+            if os.path.exists(self.tmp_dir):
+                shutil.rmtree(self.tmp_dir)
 
     def check_args(self):
         has_single_need_arg = self.bin or self.json or self.hpm or self.all
@@ -351,7 +359,7 @@ class BmcgoCommand:
 
     def get_sr_file_and_oem(self):
         sr_make_options_list = []
-        csr_path = self.csr_path
+        csr_path = self.merger.get_single_csr(self.csr_path)
         oem_path = self.oem_path
         oem_data = bytearray()
         if not os.path.exists(csr_path):
@@ -382,7 +390,7 @@ class BmcgoCommand:
 
     def get_sr_files(self):
         dir_path = Path(self.csr_path)
-        sr_files = [file for file in dir_path.glob("*.sr")]
+        sr_files = self.merger.get_multi_files(dir_path)
         sr_num = len(sr_files)
         if sr_num == 1:
             log.info("开始执行CSR出包任务...")

bmcgo/tasks/task_build_conan.py

@@ -44,6 +44,16 @@ from bmcgo.component.component_helper import ComponentHelper
 IBMC_LOCK_FILE = "openubmc.lock"
 SDK_ROOT = "/opt/hi1711sdk"
 SDK_ROOT_MODULE_SYMVERS = os.path.join(SDK_ROOT, "Module.symvers")
+PERSIST_TYPES = {
+    "TemporaryPer": "TemporaryPer",
+    "TemporaryPerRetain": "TemporaryPer",
+    "ResetPer": "ResetPer",
+    "ResetPerRetain": "ResetPer",
+    "PoweroffPer": "PoweroffPer",
+    "PoweroffPerRetain": "PoweroffPer",
+    "PermanentPer": "PermanentPer"
+}
+PRIMARY_KEYS = "PrimaryKeys"
 tools = Tools()
 
 
@@ -244,6 +254,13 @@ class TaskClass(Task):
             subsys = os.path.join(subsys, misc.StageEnum.STAGE_RC.value)
         return subsys
 
+    @staticmethod
+    def match_persist_type(usage):
+        for item in usage:
+            if item in PERSIST_TYPES:
+                return PERSIST_TYPES[item]
+        return None
+
     def find_conan_package_and_write(self, search, comps, file_handler, stage):
         if search.find("/") < 0:
             search += "/"
@@ -421,7 +438,8 @@ class TaskClass(Task):
             "TemporaryPer": {},
             "ResetPer": {},
             "PoweroffPer": {},
-            "PermanentPer": {}
+            "PermanentPer": {},
+            "PrimaryKeys": {}
         }
         for comp in comps:
             try:
@@ -435,17 +453,20 @@ class TaskClass(Task):
         self.run_command(f"cp -df {temp_dst_file} {dst_file}", sudo=True)
         self.run_command(f"rm -rf {temp_dst_file}", sudo=True)
 
-    def proc_sensitive(self, per_type, props, table_name, output):
-        for prop_name, prop_data in props.items():
-            for item in prop_data.get("usage", []):
-                if item in output:
-                    per_type = item
-                    break
-            is_sensitive = prop_data.get("sensitive", False)
-            if per_type not in output or not is_sensitive:
+    def proc_sensitive(self, table_type, props, table_name, output):
+        for prop_key, prop_data in props.items():
+            prop_name = prop_key
+            if "alias" in prop_data:
+                prop_name = prop_data.get("alias")
+            if prop_data.get("primaryKey"):
+                output[PRIMARY_KEYS][table_name] = output[PRIMARY_KEYS].get(table_name, {})
+                output[PRIMARY_KEYS][table_name][prop_name] = prop_data.get("sensitive", False)
+                continue
+            per_type = self.match_persist_type(prop_data.get("usage", [])) or table_type
+            if not per_type:
                 continue
             output[per_type][table_name] = output[per_type].get(table_name, {})
-            output[per_type][table_name][prop_name] = True
+            output[per_type][table_name][prop_name] = prop_data.get("sensitive", False)
         return output
 
     def proc_comp(self, comp, output):
@@ -455,15 +476,15 @@ class TaskClass(Task):
         with open(model_file, "r") as fp:
             content = json.load(fp)
         for class_data in content.values():
-            per_type = class_data.get("tableType", "")
+            table_type = PERSIST_TYPES.get(class_data.get("tableType", ""))
             table_name = class_data.get("tableName", "")
-            if not table_name:
+            if not table_name or class_data.get("tableLocation") == "Local":
                 continue
             class_props = [class_data.get("properties", {})]
             for intf_data in class_data.get("interfaces", {}).values():
                 class_props.append(intf_data.get("properties", {}))
             for props in class_props:
-                output = self.proc_sensitive(per_type, props, table_name, output)
+                output = self.proc_sensitive(table_type, props, table_name, output)
         return output
 
     def calc_options(self):

bmcgo/utils/installations/install_plans/qemu.yml

@@ -0,0 +1,6 @@
+version_homogeneous: true
+install_steps:
+  - type: apt
+    package_name: openubmc-qemu
+    doc: https://www.openubmc.cn/marketplace/QEMU
+

bmcgo/utils/installations/install_plans/studio.yml

@@ -0,0 +1,6 @@
+version_homogeneous: true
+install_steps:
+  - type: apt
+    package_name: bmc-studio
+    doc: https://www.openubmc.cn/marketplace/BMC%20Studio
+

bmcgo/utils/installations/install_workflow.py

@@ -26,6 +26,20 @@ class InstallWorkflow:
     _workflows: Dict[str, List[str]] = {}
     search_paths: List[Path] = [Path(__file__).resolve().parent / install_consts.PLUGIN_INSTALL_PLAN_PATH]
 
+    @staticmethod
+    def tool_exists(tool_name: str, install_type: str):
+        try:
+            if install_type == "pip":
+                ret = tools.run_command(f"pip show {tool_name}", capture_output=True, ignore_error=True)
+                return ret.returncode == 0
+            if install_type == "apt":
+                ret = tools.run_command(f"dpkg -s {tool_name}", capture_output=True, ignore_error=True)
+                return "Status: install ok installed" in ret.stdout
+        except Exception as e:
+            tools.log.info(f"校验工具存在性时报错：{str(e)}")
+
+        return False
+    
     @classmethod
     def discover_workflows(cls):
         for path in cls.search_paths:
@@ -35,7 +49,8 @@ class InstallWorkflow:
 
             for yml_file in path.glob("*.yml"):
                 with open(yml_file) as conf:
-                    cls._workflows[yml_file.stem] = yaml.safe_load(conf)
+                    file_content = yaml.safe_load(conf)
+                    cls._register_workflows(yml_file=yml_file, file_content=file_content)
 
     @classmethod
     def parse(cls, name: str) -> List[str]:
@@ -51,4 +66,15 @@ class InstallWorkflow:
 
     @classmethod
     def get_all_plans(cls):
-        return cls._workflows.keys()
+        return cls._workflows.keys()
+    
+    @classmethod
+    def _register_workflows(cls, yml_file, file_content):
+        plans = file_content.get(install_consts.PLAN_STEPS, [])
+        for plan in plans:
+            inst_type = plan.get(install_consts.PLAN_INSTALL_TYPE)
+            if not inst_type:
+                raise ValueError(f"未配置 {yml_file}/{install_consts.PLAN_STEPS}/{install_consts.PLAN_INSTALL_TYPE}")
+            package_name = plan.get(install_consts.PLAN_PACKAGE_NAME)
+            if cls.tool_exists(package_name, inst_type): # 未安装的工具不加入_workflows
+                cls._workflows[yml_file.stem] = file_content

bmcgo/utils/merge_csr.py

@@ -0,0 +1,124 @@
+# 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 json
+import re
+import os
+from pathlib import Path
+from bmcgo.utils.tools import Tools
+
+tools = Tools("bmcgo_config")
+log = tools.log
+
+
+class Merger():
+    def __init__(self, output_dir):
+        self.output_dir = output_dir
+        self.special_suffix = ("_basic_info", "_mgmt_model", "_version")
+        self.tmp_dir = None
+
+    @staticmethod
+    def remove_json5_comments(text):
+        pattern = r"""
+            ("(?:\\.|[^"\\])*"
+            |'(?:\\.|[^'\\])*'
+            )
+            |(/\*[\s\S]*?\*/
+            |//[^\n]*
+            )
+        """
+
+        def replacer(match):
+            if match.group(1):
+                return match.group(1)
+            else:
+                return ''
+        return json.loads(re.sub(pattern, replacer, text, flags=re.VERBOSE))
+
+    def merge_json(self, dict1, dict2, is_top_level=True, path=None):
+        if path is None:
+            path = []
+        if not isinstance(dict1, dict) or not isinstance(dict2, dict):
+            if dict1 != dict2:
+                raise ValueError(f"字段冲突，路径{'/'.join(path)}的值不一致：{dict1} vs {dict2}")
+            return dict1
+        for key, value in dict2.items():
+            if key in dict1:
+                if is_top_level:
+                    _ = self.merge_json(dict1[key], value, is_top_level=False, path=path + [key])
+                else:
+                    raise ValueError(f"字段冲突：路径 {'/'.join(path + [key])} 在多个文件中重复出现")
+            else:
+                dict1[key] = value
+        return dict1
+
+    def generate_csr(self, filelist, csr_path):
+        log.info(f"正在创建临时csr文件")
+        merged = {}
+        for file_path in filelist:
+            p = Path(file_path)
+            if not p.exists():
+                raise FileNotFoundError(f"文件不存在：{file_path}")
+            with open(p, "r", encoding="utf-8") as fp:
+                content = self.remove_json5_comments(fp.read())
+                merged = self.merge_json(merged, content)
+        with open(csr_path, "w") as f:
+            json.dump(merged, f)
+        log.info(f"临时文件创建成功")
+
+    def update_tmp_dir(self, tmp_dir):
+        self.tmp_dir = tmp_dir
+
+    def get_single_csr(self, csr_path):
+        if os.path.exists(csr_path):
+            return csr_path
+        name, ext = os.path.splitext(csr_path)
+        modularize_csr = []
+        for suffix in self.special_suffix:
+            new_path = f"{name}{suffix}{ext}"
+            if not os.path.exists(new_path):
+                raise FileNotFoundError(f"路径 {new_path} 不存在")
+            modularize_csr.append(new_path)
+        csr_path = os.path.join(self.tmp_dir, os.path.basename(csr_path))
+        self.generate_csr(modularize_csr, csr_path)
+        return csr_path
+
+    def get_multi_files(self, dir_path):
+        srs = list(dir_path.glob("*.sr"))
+        stem_to_path = {p.stem: p for p in srs}
+        special_by_base = {}
+        for p in srs:
+            stem = p.stem
+            for suf in self.special_suffix:
+                if not stem.endswith(suf):
+                    continue
+                base = stem.removesuffix(suf)
+                if base:
+                    special_by_base.setdefault(base, {})[suf] = p
+                break
+        to_skip = set()
+        to_create = []
+        for base, mod_path in special_by_base.items():
+            if base in stem_to_path:
+                to_skip.update(mod_path.values())
+            else:
+                if not all(s in mod_path for s in self.special_suffix):
+                    continue
+                plain = dir_path / f"{base}.sr"
+                if not plain.exists():
+                    plain = os.path.join(self.tmp_dir, f"{base}.sr")
+                    self.generate_csr([mod_path[s] for s in self.special_suffix], plain)
+                to_create.append(plain)
+                to_skip.update(mod_path.values())
+        res = [p for p in srs if p not in to_skip]
+        res.extend(to_create)
+        log.info(res)
+        return res

{openubmc_bingo-0.5.275.dist-info → openubmc_bingo-0.5.277.dist-info}/METADATA

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

{openubmc_bingo-0.5.275.dist-info → openubmc_bingo-0.5.277.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=K6ySNOeqhcSy0bTd4f3Q96_bbvXTqoA0ok8CL67BRAM,563
+bmcgo/__init__.py,sha256=SE0k3y8-A9Ww0-Mkf-KEYBYaGigM3CfrxZ3Kmh-f7Mo,563
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=zPghH-W8vNK1bAc5PjfwnWzkHYT499PlGbhUWhPKT5U,10888
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -195,7 +195,7 @@ bmcgo/functional/bmc_studio_action.py,sha256=Gg96UB8QtnhsaqSdMhXuS9fddzAFPhR6UYC
 bmcgo/functional/check.py,sha256=LWoDAtEB2p65FemLEoNGz33ldtkbcJlc-uz8hwJl89U,8183
 bmcgo/functional/conan_index_build.py,sha256=cYpv83DFnsbUJri_dKyThLo7-SDRQ4253P4Nud-HYFY,9074
 bmcgo/functional/config.py,sha256=ZQ-a9hegI0cV41iTo7t49ryBeUH4wPJ-qkVvWp8toV4,10824
-bmcgo/functional/csr_build.py,sha256=_1ZGYxMNOmd_52upS1RdXf1uT8rjaW1bfIw7psfkDt0,40791
+bmcgo/functional/csr_build.py,sha256=h1kyvTEdIbtcSDRCgc70xjChE-sat_SJXltxlulc2xU,41146
 bmcgo/functional/deploy.py,sha256=2NsxCpoZjL4jTyRpbIp20-EKKbQkQe-Hsm20uxHK2Xc,10677
 bmcgo/functional/diff.py,sha256=WBH6aRVyVInzyvqQrmslqpItKncFbB2Z9WIBE1_O6bo,10558
 bmcgo/functional/fetch.py,sha256=JE4iZt6a-vjuCrDg9RYDCTyLf5TvXZQvs0PgD3VBvtQ,10767
@@ -220,7 +220,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=n7EhquD3FQeT8LHk0tREKOG9t1BcbMge_TY6ekGFydk,17064
-bmcgo/tasks/task_build_conan.py,sha256=nQt4VyK4QHh2u4JbM8kfK9WBVIMGKI18S2NPg9orlvQ,32962
+bmcgo/tasks/task_build_conan.py,sha256=C6zGBSa3ai8p0_5timmfcqRh7sn6lNMdXl9Fi-TUEPA,33799
 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
@@ -243,19 +243,22 @@ bmcgo/utils/fetch_component_code.py,sha256=vH9rY2YcXK5tBUEK7fLmKVxK9cYDM39FHmMan
 bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
 bmcgo/utils/mapping_config_patch.py,sha256=_gKfZnrvsLPgHn1yXhEJRVTAeuGpeGD9T-Pqyw5Ydys,16827
+bmcgo/utils/merge_csr.py,sha256=JNxHCfW1au84WQshdz0aQy8wMTEOHonjQT3s6LjlZN4,4580
 bmcgo/utils/perf_analysis.py,sha256=fh6lV9AAKVhpPkGPwAJ8EWfGfUoHjqGYQxrvc32Xiac,4767
 bmcgo/utils/tools.py,sha256=athCcqcHgtIZY23GxziWdFjgjEhjGqTwbnezXjmg94Y,27421
 bmcgo/utils/installations/README.md,sha256=hKXnFYmeHEuROFMFE-vzlGLSHg71bei5ZYwyYZphWNk,2
 bmcgo/utils/installations/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/installations/base_installer.py,sha256=3UZiKWoa41ygRbLD3QsE2FTp-VFp79V0I53QLRIf4E8,5902
 bmcgo/utils/installations/install_consts.py,sha256=QrRYfjw-rkwRllXDvC-pqoAH3Ii_tXsj590gzYxnAFA,1104
-bmcgo/utils/installations/install_workflow.py,sha256=KS1rdIpeomDgf50K__5t-lAMzCGuerJfdQoiDSxmi3w,1857
+bmcgo/utils/installations/install_workflow.py,sha256=wT6lTE_s-NZP8LSZR1xlu4dXTtPTEai1dsq3D5-kLzE,3162
 bmcgo/utils/installations/version_util.py,sha256=dOwvLZ7iOmnzSeyD6_pRm7NS7I13Um5mSD_y0dVyO6M,3212
 bmcgo/utils/installations/install_plans/bingo.yml,sha256=Zw1HnAyNJdEwkE3fnd-_GCe9bwv1m6bmMlaQTJXaFa8,210
+bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRqTlcaMxErxjnSaCMkQ9A,138
+bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 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.275.dist-info/METADATA,sha256=svABE4XE8SKEkYtUZaeEx5fKre-tn6oyDSi_zfy3urs,956
-openubmc_bingo-0.5.275.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.5.275.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.5.275.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.5.275.dist-info/RECORD,,
+openubmc_bingo-0.5.277.dist-info/METADATA,sha256=A4lw7rAE8BogjZR_XLW2b_sVcoTZD478JX_PYHNBIFw,956
+openubmc_bingo-0.5.277.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.5.277.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.5.277.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.5.277.dist-info/RECORD,,