openubmc-bingo 0.6.48__py3-none-any.whl → 0.6.51__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.48'
+__version__ = '0.6.51'

bmcgo/component/analysis/analysis.py

@@ -119,18 +119,22 @@ class AnalysisComp():
             excluded_str = "/dev" if misc.conan_v1() else "openubmc"
             if node.package_name == "busybox" and excluded_str in node.ref:
                 continue
+            if node.is_build_tool:
+                continue
             packages[node.index] = node
             requires[node.index] = node_data.get("requires", [])
             if misc.conan_v2():
                 dependencies_data = node_data.get("dependencies", [])
-                dependencies_keys = list(dependencies_data.keys())
+                dependencies_keys = [key for key, dep in dependencies_data.items() if dep["direct"]]
                 requires[node.index] = dependencies_keys
         comm_name = misc.community_name()
         for index, pkg in packages.items():
             if not pkg.name.startswith(comm_name):
                 self.set_node_subsys(pkg)
             for require_id in requires.get(index, []):
-                pkg.requires.append(packages.get(int(require_id), None))
+                require_package = packages.get(int(require_id), None)
+                if require_package:
+                    pkg.requires.append(require_package)
             if not pkg.name.startswith(comm_name):
                 self.nodes.append(pkg)
 

bmcgo/component/analysis/dep-rules.json

@@ -1,7 +1,11 @@
 {
-    "Version": "0.0.46",
+    "Version": "0.0.47",
     "Description": "此文件对iBMCV3子系统与子系统、组件与组件的依赖关系约束进行了描述, 只有子系统架构师/领域专家才能修改",
     "Changelog": {
+        "0.0.47": [
+            "1、framework子系统增加设备驱动管理组件devmon",
+            "2、framework子系统增加设备驱动管理库component_drivers, libmcpp"
+        ],
         "0.0.46": [
             "1、om子系统增加可观测组件observability",
             "2、opensource增加可观测需要的开源软件, 包括fluent-bit, libyaml, opentelemetry, grpc, abseil, protobuf, re2, c_ares,opentelemetry-proto",
@@ -42,7 +46,6 @@
                 "libyaml",
                 "opentelemetry",
                 "grpc",
-                "grpc_tool",
                 "abseil",
                 "protobuf",
                 "re2",
@@ -103,7 +106,8 @@
                 "persistence",
                 "key_mgmt",
                 "hwdiscovery",
-                "hwproxy"
+                "hwproxy",
+                "devmon"
             ],
             "Libraries": [
                 "persistence",
@@ -117,7 +121,9 @@
                 "libmcc",
                 "libmgmt_protocol",
                 "libkvs",
-                "liblogger"
+                "liblogger",
+                "component_drivers",
+                "libmcpp"
             ],
             "Configurations": [
                 "rootfs_user"

bmcgo/component/analysis/dep_node.py

@@ -51,7 +51,9 @@ class DepNode():
         self.local_tables = {}
         self.remote_tables = {}
         self.table_conflict = False
+        self.is_build_tool = False
         if misc.conan_v2():
+            self.is_build_tool = node.get("context") == "build"
             self.recipe_folder = node.get("recipe_folder")
             self.binary = node.get("binary", "")
             if self.binary == "Skip":

bmcgo/component/analysis/intf_validation.py

@@ -34,15 +34,13 @@ class InterfaceValidation:
         self.intf_hardcoded: Dict[str, Set[str]] = defaultdict(set)
         self.all_predefined_intfs: Set[str] = set()
         self.remote = remote
-        self._parse_mds_interfaces()
-        self._parse_hardcoded_interfaces()
-        self._pull_all_interfaces()
+        self.mdb_interface_repo_url = "https://gitcode.com/openUBMC/mdb_interface.git"
 
     @staticmethod
     def extract_dbus_intf_in_file(file_path):
         all_intfs = list()
         with open(file_path, "r") as file_descriptor:
-            # iBMC d-bus interface pattern: bmc.(kepler|dev).[A-Z]
+            # d-bus interface pattern: bmc.(kepler|dev).[A-Z]
             pattern = "[\"\']bmc\.(?:kepler|dev)(?:\.[A-Z].*?)?[\"\']"
             intf_match = re.findall(pattern, file_descriptor.read())
             for intf in intf_match:
@@ -96,6 +94,10 @@ class InterfaceValidation:
         return package
 
     def run(self):
+        self._parse_mds_interfaces()
+        self._parse_hardcoded_interfaces()
+        self._pull_all_interfaces()
+    
         intf_validation_passed = self._validate_mds_intf() and self._validate_hardcoded_intf() and \
                 self._check_dbus_call()
         if intf_validation_passed:
@@ -142,7 +144,6 @@ class InterfaceValidation:
                     self.intf_hardcoded[intf].update([file_path])
 
     def _pull_interfaces_from_repo(self):
-        mdb_interface_repo_url = "https://gitcode.com/openUBMC/mdb_interface.git"
         mktemp_cmd = subprocess.run(["/usr/bin/mktemp", "-d", "--suffix", "_mdb_interface"], capture_output=True)
         if mktemp_cmd.returncode != 0:
             raise OSError(f"创建文件夹失败, 错误消息: {mktemp_cmd.stderr}")
@@ -150,10 +151,10 @@ class InterfaceValidation:
 
         git_cmd = Helper.get_git_path()
         repo_fetch = subprocess.run(
-            [git_cmd, "clone", mdb_interface_repo_url, temp_dir, "--depth=1"],
+            [git_cmd, "clone", self.mdb_interface_repo_url, temp_dir, "--depth=1"],
             stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
         if repo_fetch.returncode != 0:
-            log.error("克隆远端仓库 %s 失败, 错误信息: %s", mdb_interface_repo_url, repo_fetch.stderr)
+            log.error("克隆远端仓库 %s 失败, 错误信息: %s", self.mdb_interface_repo_url, repo_fetch.stderr)
         intf_dir = os.path.join(temp_dir, "json/intf/mdb/bmc")
 
         for root, _, files in os.walk(intf_dir):

bmcgo/component/analysis/sr_validation.py

@@ -22,6 +22,7 @@ from bmcgo.logger import Logger
 
 global log
 log = Logger()
+script_dir = os.path.split(os.path.realpath(__file__))[0]
 
 SOFT_SR_SUFFIX = "_soft.sr"
 SOFTWARE_SUFFIX = "software"
@@ -194,7 +195,7 @@ class SrValidate(SrParser):
         self.is_product_sr_repo = False
         self.check_repo_type()
         self.smc_dfx_whitelist: Dict[str, Set[Tuple[int, int]]] = defaultdict(set)
-        self.load_smc_dfx_whitelist()
+        self.whitelist_file = os.path.join(script_dir, "smc_dfx_whitelist.json")
 
     @staticmethod
     def merge_sr_objects(hardware_sr_objects: Dict[str, Dict], software_sr_objects: Dict[str, Dict]):
@@ -227,11 +228,10 @@ class SrValidate(SrParser):
             log.error('mds/service.json 文件解析失败: %s', e)
 
     def load_smc_dfx_whitelist(self):
-        whitelist_file = Path(__file__).parent.joinpath("smc_dfx_whitelist.json")
-        if not os.path.exists(whitelist_file):
+        if not os.path.exists(self.whitelist_file):
             return
         try:
-            with open(whitelist_file, 'r') as file_descriptor:
+            with open(self.whitelist_file, 'r') as file_descriptor:
                 content = json.load(file_descriptor)
             for item in content:
                 chip_type = item.get("ChipType")
@@ -245,6 +245,7 @@ class SrValidate(SrParser):
     def run(self):
         if not self.is_sr_repo:
             return True
+        self.load_smc_dfx_whitelist()
         self.find_soft_sr_files()
         self.walk_sr_dir()
         file_count, problems_total, issues_count = self.log_issues()

bmcgo/functional/analysis.py

@@ -12,7 +12,6 @@
 # See the Mulan PSL v2 for more details.
 import os
 import argparse
-from multiprocessing import Process
 import urllib3
 from bmcgo.frame import Frame
 from bmcgo.misc import CommandInfo
@@ -60,23 +59,30 @@ class BmcgoCommand:
         self.out_dir = pre_parsed_args.out_dir
         self.lock_file = pre_parsed_args.lock_file
         self.board_name = pre_parsed_args.board_name
+
+    def component_analysis(self):
+        if not InterfaceValidation(self.remote).run() or not SrValidate(os.getcwd()).run():
+            return -1
+        return 0
     
+    def product_analysis(self, custom_sr_dir):
+        analysis_task = AnalysisComp(self.board_name, self.out_dir, self.lock_file, custom_sr_dir)
+        result = analysis_task.run()
+        return result
+
     def run(self):
         is_integrated, work_dir = self._is_integrated_project()
         if is_integrated:
             os.chdir(work_dir)
         else:
             os.chdir(self.bconfig.component.folder)
-        # 组件级构建
+        # 组件级
         if not is_integrated:
-            if not InterfaceValidation(self.remote).run() or not SrValidate(os.getcwd()).run():
-                return -1
-            return 0
-        custom_sr_dir = None
-        # 非集成环境
-        if not is_integrated:
-            custom_sr_dir = os.getcwd()
-        elif self.rebuild:
+            return self.component_analysis()
+
+        # 产品级
+        custom_sr_dir = os.getcwd()
+        if self.rebuild:
             parsed = []
             if self.board_name:
                 parsed.append("-b")
@@ -85,9 +91,9 @@ class BmcgoCommand:
                 frame = Frame(self.bconfig, config)
                 frame.parse(parsed)
                 frame.run()
+
         os.chdir(os.path.join(work_dir, misc.BUILD))
-        analysis_task = AnalysisComp(self.board_name, self.out_dir, self.lock_file, custom_sr_dir)
-        rc = analysis_task.run()
+        rc = self.product_analysis(custom_sr_dir)
         if not rc:
             return -1
         log.success("BMC 构建分析成功")

bmcgo/tasks/task_build_conan.py

@@ -251,8 +251,8 @@ class ConanLockParse:
             for com, entry_degree in entry_degree_temp_dict.items():
                 if entry_degree != 0:
                     continue
-                # openubmc作为一个最终组件，不推送(远端没有，直接弹出)
-                if com.startswith("openubmc/"):
+                # 最终组件，不推送(远端没有，直接弹出)
+                if com.startswith(f"{misc.community_name()}/"):
                     self._degree.pop(com)
                     break
                 cmd_tmp = cmd.replace("com_name", f"{com}")
@@ -459,7 +459,7 @@ class TaskClass(Task):
         self.component_check = ComponentVersionCheck(
             manifest_yml="manifest.yml",
             ibmc_lock=self.lockfile,
-            community_name="openubmc",
+            community_name=misc.community_name(),
             openubmcsdk=openubmcsdk
             )
         for dep in deps:
@@ -521,7 +521,7 @@ class TaskClass(Task):
         self.component_check = ComponentVersionCheck(
             manifest_yml="manifest.yml",
             ibmc_lock=self.lockfile,
-            community_name="openubmc",
+            community_name=misc.community_name(),
             openubmcsdk=openubmcsdk
             )
         for dep in deps:
@@ -582,7 +582,7 @@ class TaskClass(Task):
         with os.fdopen(os.open(self.package_info, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, stat.S_IWUSR | stat.S_IRUSR |
                                stat.S_IWGRP | stat.S_IRGRP | stat.S_IWOTH | stat.S_IROTH), 'w') as fp:
             for package in require_list:
-                if "openubmc/" not in package:
+                if f"{misc.community_name()}/" not in package:
                     fp.write(f"{package.split('#')[0]}\n")
                 else:
                     package_info_list.remove(package)
@@ -813,6 +813,9 @@ class TaskClass(Task):
         os.makedirs(openubmc_dir, exist_ok=True)
         shutil.copytree(conanfile_dir, openubmc_dir, dirs_exist_ok=True)
         self.chdir(openubmc_dir)
+        # 替换默认的根组件名为实际的community name
+        tools.run_command(f"sed -i 's/openubmc/{misc.community_name()}/g' conanfile.py")
+
         # 复制manifest.yml文件
         if misc.conan_v2():
             self.merge_manifest_v2()
@@ -1061,7 +1064,7 @@ class TaskClass(Task):
         for dirname in os.listdir("."):
             if not os.path.isdir(dirname):
                 continue
-            if dirname != "rootfs" and dirname != "openubmc":
+            if dirname != "rootfs" and dirname != misc.community_name():
                 comps.append(dirname)
         
         self.copy_components(comps, profile)

{openubmc_bingo-0.6.48.dist-info → openubmc_bingo-0.6.51.dist-info}/METADATA

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

{openubmc_bingo-0.6.48.dist-info → openubmc_bingo-0.6.51.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=zNLxZCPEhBXktWdUgwGoCSS4a83Mu_1gVP-esK_r0YY,562
+bmcgo/__init__.py,sha256=gPR11fdu-7LXVTAiD7rNONaYFEKBD8FQRCv_fHBZFg4,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -175,16 +175,16 @@ bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,654
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
 bmcgo/component/package_info.py,sha256=pYgubJ-564JXQmEaSlYfGnoVgrNlY3O5jJP1vxZe-Qc,14844
 bmcgo/component/test.py,sha256=Kpg5fmcJ-F2lDlHsKTBXjhB00T-IOr5QWGfHsRXVgA0,45260
-bmcgo/component/analysis/analysis.py,sha256=flNkGn468I0wi6mAIuygyPK7eA5PWBw3Ks56B5rrhmc,9179
+bmcgo/component/analysis/analysis.py,sha256=oc5m6qGWZm6G3n8cVENs86DAWywMNuxTqhO5QIb9fX8,9363
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
 bmcgo/component/analysis/data_deps.py,sha256=lDCVZ1B56pOW3BApCroujEaak4I07tN9mDOWruhuDkc,16431
-bmcgo/component/analysis/dep-rules.json,sha256=Na1FoRkdcDpT5nlMR3EfdG-xFND4ghZk5Xr_g-fgynk,34995
-bmcgo/component/analysis/dep_node.py,sha256=i3BRg2iHRy-qv653--ckEJbl_sr-TdIhoEmGuTgZRBg,5168
+bmcgo/component/analysis/dep-rules.json,sha256=fLNK_MN7plr9WYLzlla56geGBreYQ_3t9xZSIX0beag,35251
+bmcgo/component/analysis/dep_node.py,sha256=1ZfSElBPfreuugPclQPgQcTq-LlshYLlDVwzgr1lHVY,5267
 bmcgo/component/analysis/intf_deps.py,sha256=IlcPixdaBpXpb6U4M-I1hRRGHCg5SCUg07V6kAosacE,7382
-bmcgo/component/analysis/intf_validation.py,sha256=hAY9pB3_-2gkAyCE2aazW_twoAmlU3ePEg4oJHFgCh4,11422
+bmcgo/component/analysis/intf_validation.py,sha256=CIfyc8AWIm5z2SnjhoNQEppIkaJoOxDtQc3eynI2Oa4,11437
 bmcgo/component/analysis/rule.py,sha256=xvntmvFdGa0J8WBlrHDdJ5bcl3jr4pXezR3KKvOg4Ag,7549
 bmcgo/component/analysis/smc_dfx_whitelist.json,sha256=ur8WLSSDM696_PtbSOYciMV50TzbUgP2voVt_QbTCw0,202
-bmcgo/component/analysis/sr_validation.py,sha256=OrgPPjlOoLgRQyD_J6VZXAY0I6gtqGVOAhpGj0IY11Q,14876
+bmcgo/component/analysis/sr_validation.py,sha256=8fmTGw_UyhvySQ2ASSMMA1w2jNMXihya97TJJa5GY8Y,14943
 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=Uf-UdY4CW9rpP4sbURkCXBWyYMXWaG3R1Pyo3cDNvcQ,16859
@@ -193,7 +193,7 @@ bmcgo/component/template/conanfile.deploy.py.mako,sha256=zpxluBjUFmJHfFrnBknxZ3c
 bmcgo/component/template_v2/conanbase.py.mako,sha256=H0yO-uijpENtujj_1u037U2mZyy_ykdkV9hkj3mFuV4,15748
 bmcgo/component/template_v2/conanfile.deploy.py.mako,sha256=Xbd-PlfVHOWeRFLfvzINeykiZzzSHsgO_yUUvYrKqTw,512
 bmcgo/functional/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/functional/analysis.py,sha256=pXakxSojBH-dULngbmgMHR3bq9tphOaAN4euGKgEYoc,4016
+bmcgo/functional/analysis.py,sha256=4FaJlz7CbupHAdCdhdrRZCTlnHZ0bz7Cy32FNg9Ik_0,4097
 bmcgo/functional/bmc_studio_action.py,sha256=Gg96UB8QtnhsaqSdMhXuS9fddzAFPhR6UYCpto9UOYA,3605
 bmcgo/functional/check.py,sha256=ReGN_8RRM6isX_r7XXEuHzkooh8pasky5_GpAml5d_g,8356
 bmcgo/functional/conan_index_build.py,sha256=Mp1fDpZVvecn5lUCsWZqq3mKSx9yu5pznQrDZr4Liuk,13443
@@ -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=5VXdm6kyuX93C-ZazDcQ2KCfJFnYRgkzLFJFSPs0OzU,53028
+bmcgo/tasks/task_build_conan.py,sha256=XYK2Ge6sDE8lQI4AOh2StVXq045-LdvNVnxw848EG70,53227
 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
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 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.6.48.dist-info/METADATA,sha256=XiUcm7N7ZJ5iFH5oUKmfzCQvDA3v5oD8qZchf24pZ_s,1010
-openubmc_bingo-0.6.48.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.48.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.48.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.48.dist-info/RECORD,,
+openubmc_bingo-0.6.51.dist-info/METADATA,sha256=LhSm0RCzavLoRo86bOwXimNKy7gEFCurUCor5ak9dnw,1010
+openubmc_bingo-0.6.51.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.51.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.51.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.51.dist-info/RECORD,,