openubmc-bingo 0.6.0__py3-none-any.whl → 0.6.3__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.0'
+__version__ = '0.6.3'

bmcgo/cli/cli.py

@@ -342,11 +342,20 @@ class Command(object):
                 return True
         if need_conan_v2 and misc.conan_v1():
             log.warning("检测到依赖conan2.0但仅安装了conan1.0，尝试重新安装conan2.0")
+            log.info("1. 组件仓支持conan2.0的依据：conanfile.py中未申明`required_conan_version`或依赖conan 2.x.x，\
+                     如`quired_conan_version = '>=2.13.0'`")
+            log.info("2. manifest或ibmc_sdk仓等支持conan2.0的依据：.bmcgo/config或.bingo/config文件记录的conan.version配置版本以2开头，如配置为:")
+            log.info("    [conan]")
+            log.info("    version = 2.x.x")
+            log.info("3. conan_index仓使用参数`--conan2`控制是否构建conan2.0包（conan2.0包配方存储在recipes2目录）")
             tools.run_command("pip3 install conan==2.13.0 --force-reinstall --break-system-packages")
             log.warning("检测到依赖conan2.0但仅安装了conan1.0，已安装conan2.0，任务退出，请重新执行")
             return False
         if not need_conan_v2 and misc.conan_v2():
             log.warning("检测到依赖conan1.0但仅安装了conan2.0，尝试重新安装conan1.0")
+            log.info("1. 组件仓支持conan1.0的依据：conanfile.py中未申明`required_conan_version`或依赖conan 1.x.x")
+            log.info("2. manifest或ibmc_sdk仓支持conan1.0的依据：.bmcgo/config或.bingo/config文件未记录的conan.version配置")
+            log.info("3. conan_index仓默认（不指定`--conan2`时）构建conan1.0包（conan1.0包配方存储在recipes目录）")
             tools.run_command("pip3 install conan==1.62.0 --force-reinstall --break-system-packages")
             log.warning("检测到依赖conan1.0但仅安装了conan2.0，已安装conan1.0，任务退出，请重新执行")
             return False

bmcgo/codegen/lua/codegen.py

@@ -110,7 +110,7 @@ class CodeGen(object):
         mdb_interface_tmp_dir = os.path.join(conan_home, "latest_mdb_interface")
         env = dict(os.environ, CONAN_STORAGE_PATH=mdb_interface_tmp_dir)
 
-        channel = f"@{Tools().conan_user}/{misc.StageEnum.STAGE_RC.value}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
         package = f"mdb_interface/[>=0.0.1]{channel}"
         
         cmd = ["conan", "install", package, f"-if={temp_dir}", "--update", "--build=missing", "-g", "deploy"]

bmcgo/component/deploy.py

@@ -93,7 +93,7 @@ class DeployComp():
         return dependencies
 
     def gen_conanfile(self):
-        dependencies = self.info.package
+        dependencies = [self.info.package]
         if self.info.test:
             dependencies += self.get_dt_dependencies()
 

bmcgo/component/template/conanbase.py.mako

@@ -5,6 +5,7 @@ import urllib3
 import shutil
 % endif
 from conans import ConanFile, CMake
+from conan.tools.files import copy
 % if pkg.is_maintain:
 from conans import tools
 from conans.util.files import mkdir

bmcgo/component/template_v2/conanbase.py.mako

@@ -1,7 +1,20 @@
+#!/usr/bin/env python
+# coding=utf-8
+# Copyright (c) 2024 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 concurrent.futures
 import urllib3
+% if not pkg.is_maintain:
 import time
-import concurrent.futures
+% endif
 % if pkg.is_maintain:
 import stat
 import shutil
@@ -48,7 +61,7 @@ class ConanBase(ConanFile):
         "enable_luajit": [True, False],
     % endif
     % for op, ctx in pkg.design_options.items():
-        "${op}": [${",".join(("\"" + i + "\"") if isinstance(i, str) else str(i) for i in ctx["option"])}],
+        "${op}": [${", ".join(("\"" + i + "\"") if isinstance(i, str) else str(i) for i in ctx["option"])}],
     % endfor
     }
     default_options = {
@@ -64,13 +77,6 @@ class ConanBase(ConanFile):
     % endfor
     }
 
-% if language == "c":
-    def _codegen(self):
-        args = ["-s", "mds/service.json"]
-        gen = GenComp(args)
-        gen.run(self._codegen_version)
-% endif
-
     def layout(self):
         cmake_layout(self, build_folder=".build")
 
@@ -112,7 +118,7 @@ class ConanBase(ConanFile):
         tag = git.run("tag --points-at HEAD")
         update_conandata(self, {"sources": {self.version: {"branch": f"refs/tags/{tag}" if tag else commit, "url": url}}})
         % endif
-    
+
     % if pkg.is_maintain:
     def export_sources(self):
         patches = self.conan_data.get("patches", {}).get(self.version, [])
@@ -125,76 +131,23 @@ class ConanBase(ConanFile):
             dst = os.path.join(self.export_sources_folder, patch_file)
             mkdir(os.path.dirname(dst))
             shutil.copy2(src, dst)
-    % endif
 
+    % endif
     def source(self):
         git = Git(self)
         sources = self.conan_data["sources"][self.version]
+    % if not pkg.is_maintain:
         if sources["url"] and sources["branch"]:
             git.fetch_commit(url=sources["url"], commit=sources["branch"].split("/")[-1])
         else:
             copy(self, "*", src=sources["pwd"], dst=".")
+    % else:
+        git.fetch_commit(url=sources["url"], commit=sources["branch"].split("/")[-1])
+    % endif
         % if language == "c":
         self._codegen()
         % endif
 
-    def _pre_generate(self):
-        tc = CMakeToolchain(self)
-        tc.preprocessor_definitions["_FORTIFY_SOURCE"] = "2"
-
-        tc.variables["BUILD_MANUFACTURE"] = self.options.manufacture
-        % if len(pkg.design_options) > 0:
-            % for op, _ in pkg.design_options.items():
-        tc.variables["CONAN_DEFS_${op.upper()}"] = self.options.${op}
-            % endfor
-        % endif
-    % if language == "lua":
-        if self.options.enable_luajit:
-            tc.variables["CONAN_DEFS_ENABLE_LUAJIT"] = True
-    % endif
-        if self.options.test:
-            tc.variables["ENABLE_TEST"] = True
-            tc.preprocessor_definitions["ENABLE_TEST"] = True
-        # 向CMAKE传递版本号信息
-        version = self.version.split(".")
-        if len(version) >= 1:
-            tc.variables["PACKAGE_VERSION_MAJOR"] = version[0]
-        if len(version) >= 2:
-            tc.variables["PACKAGE_VERSION_MINOR"] = version[1]
-        if len(version) >= 3:
-            tc.variables["PACKAGE_VERSION_REVISION"] = version[2]
-        # 设置额外编译选项或者重定义CFLAGS CXXFLAGS,也可以设置其他开关
-        # 示例: os.environ['CFLAGS'] = f"{os.getenv('CFLAGS')} -fPIE"
-
-        if self.settings.arch in ["armv8", "x86_64"]:
-            tc.variables["CMAKE_INSTALL_LIBDIR"] = "usr/lib64"
-        else:
-            tc.variables["CMAKE_INSTALL_LIBDIR"] = "usr/lib"
-
-        if self.options.get_safe("asan", False):
-            print("Enable asan flags")
-            asan_flags = "-fsanitize=address -fsanitize-recover=address,all -fno-omit-frame-pointer -fno-stack-protector -O0"
-            tc.extra_cflags.append(asan_flags)
-            tc.extra_cxxflags.append(asan_flags)
-            tc.extra_sharedlinkflag.append("LDFLAGS", "-fsanitize=address")
-            tc.extra_exelinkflag.append("LDFLAGS", "-fsanitize=address")
-
-        # GCOV 标志设置
-        if self.options.get_safe("gcov", False):
-            print("Enable gcov flags")
-            gcov_flags = "-ftest-coverage -fprofile-arcs -fprofile-update=atomic"
-            tc.extra_cflags.append(gcov_flags)
-            tc.extra_cxxflags.append(gcov_flags)
-        # 配合generate添加宏定义
-        tc.variables["CMAKE_TOOLCHAIN_FILE"] = "conan_toolchain.cmake"
-        # rpath配置
-        tc.variables["CMAKE_SKIP_BUILD_RPATH"] = True
-        tc.variables["CMAKE_SKIP_RPATH"] = True
-        tc.variables["CMAKE_SKIP_INSTALL_RPATH"] = True
-        tc.variables["CMAKE_BUILD_WITH_INSTALL_RPATH"] = False
-        tc.variables["CMAKE_INSTALL_RPATH_USE_LINK_PATH"] = False
-        return tc
-
     def generate(self):
         tc = self._pre_generate()
         tc.generate()
@@ -213,28 +166,7 @@ class ConanBase(ConanFile):
             files[a_file] = b_file
         return files
 
-    def _revise_renamed_files(self, changed_files):
-        for a_file, b_file in changed_files.items():
-            if a_file != b_file:
-                if a_file != "/dev/null" and b_file != "/dev/null":
-                    os.rename(a_file, b_file)
-                    cmd = f"git rm -f {a_file}"
-                    self.run(cmd)
-                elif a_file != "/dev/null":
-                    cmd = f"git rm -f {a_file}"
-                    self.run(cmd)
-                    continue
-            cmd = f"git add {b_file}"
-            self.run(cmd)
-
 %endif
-    def _configure_cmake(self):
-        if self._cmake is not None:
-            return self._cmake
-        self._cmake = CMake(self)
-        self._cmake.configure()
-        return self._cmake
-
     def build(self):
 % if pkg.is_maintain:
         for patch in self.conan_data.get("patches", {}).get(self.version, []):
@@ -267,15 +199,23 @@ class ConanBase(ConanFile):
         cmake.install()
         files_to_copy = [
             ("permissions.ini", self.source_folder, self.package_folder),
-            ("model.json", os.path.join(self.source_folder, "mds"), os.path.join(self.package_folder, "include/mds")),
-            ("service.json", os.path.join(self.source_folder, "mds"), os.path.join(self.package_folder, "include/mds")),
-            ("*", os.path.join(self.source_folder, "customization"), os.path.join(self.package_folder, "include")),
-            ("*", os.path.join(self.source_folder, "mds"), os.path.join(self.package_folder, "usr/share/doc/openubmc/${pkg.name}/mds")),
-            ("*", os.path.join(self.source_folder, "docs"), os.path.join(self.package_folder, "usr/share/doc/openubmc/${pkg.name}/docs")),
-            ("*", os.path.join(self.source_folder, "build"), os.path.join(self.package_folder, "include")),
+            ("model.json", os.path.join(self.source_folder, "mds"),
+                os.path.join(self.package_folder, "include/mds")),
+            ("service.json", os.path.join(self.source_folder, "mds"),
+                os.path.join(self.package_folder, "include/mds")),
+            ("*", os.path.join(self.source_folder, "customization"),
+                os.path.join(self.package_folder, "include")),
+            ("*", os.path.join(self.source_folder, "mds"),
+                os.path.join(self.package_folder, "usr/share/doc/openubmc/${pkg.name}/mds")),
+            ("*", os.path.join(self.source_folder, "docs"),
+                os.path.join(self.package_folder, "usr/share/doc/openubmc/${pkg.name}/docs")),
+            ("*", os.path.join(self.source_folder, "build"),
+                os.path.join(self.package_folder, "include")),
             ("permissions.ini", os.path.join(self.source_folder, "dist"), self.package_folder),
-            ("*.md", self.source_folder, os.path.join(self.package_folder,"usr/share/doc/openubmc/${pkg.name}/docs")),
-            ("*.MD", self.source_folder, os.path.join(self.package_folder,"usr/share/doc/openubmc/${pkg.name}/docs"))
+            ("*.md", self.source_folder, os.path.join(self.package_folder,
+                "usr/share/doc/openubmc/${pkg.name}/docs")),
+            ("*.MD", self.source_folder, os.path.join(self.package_folder,
+                "usr/share/doc/openubmc/${pkg.name}/docs"))
         ]
         for pattern, src, dst in files_to_copy:
             copy(self, pattern, src=src, dst=dst, keep_path=True)
@@ -287,15 +227,18 @@ class ConanBase(ConanFile):
         os.chdir(self.package_folder)
         with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
             for root, _, files in os.walk("."):
-                for file in files:
-                    if file.endswith(".lua") and not os.path.islink(os.path.join(root, file)):
-                        file_path = os.path.join(root, file)
-                        if self.options.enable_luajit:
-                            executor.submit(self.compile_file, file_path, True)
-                        else:
-                            executor.submit(self.compile_file, file_path, False)
+                self.compile_files(root, files, executor)
         rm(self, "luac.out", self.package_folder)
 
+    def compile_files(self, root, files, executor):
+        for file in files:
+            if file.endswith(".lua") and not os.path.islink(os.path.join(root, file)):
+                file_path = os.path.join(root, file)
+                if self.options.enable_luajit:
+                    executor.submit(self.compile_file, file_path, True)
+                else:
+                    executor.submit(self.compile_file, file_path, False)
+
     def compile_file(self, file_path, enable_luajit):
         if enable_luajit:
             self.run(f"luajit -b -g {file_path} {file_path}")
@@ -320,27 +263,13 @@ class ConanBase(ConanFile):
         dirs = []
         for root, _, files in os.walk("."):
             for file in files:
-                if file.endswith(".so") and file.startswith("lib"):
-                    if root.startswith("./"):
-                        dir = root[2:]
-                    else:
-                        dir = root
-                    if dir not in dirs:
-                        dirs.append(dir)
-                    lib = file[3:-3]
-                    libs.append(lib)
-                    continue
-                if file.endswith(".a") and file.startswith("lib"):
-                    if root.startswith("./"):
-                        dir = root[2:]
-                    else:
-                        dir = root
-                    if dir not in dirs:
-                        dirs.append(dir)
-                    libs.append(lib)
-                    continue
+                dirname, libname = self.find_libraries(root, file)
+                if dirname and dirname not in dirs:
+                    dirs.append(dirname)
+                if libname:
+                    libs.append(libname)
 
-        if len(dirs):
+        if dirs:
             self.cpp_info.components["${pkg.name}"].set_property("cmake_target_name", "${pkg.name}::${pkg.name}")
             self.cpp_info.components["${pkg.name}"].set_property("cmake_target_aliass", ["${pkg.name}::${pkg.name}"])
             self.cpp_info.components["${pkg.name}"].set_property("pkg_config_name", "${pkg.name}")
@@ -350,3 +279,105 @@ class ConanBase(ConanFile):
                 self.runenv_info.append("LD_LIBRARY_PATH", os.path.join(self.package_folder, dir))
                 self.buildenv_info.append("LD_LIBRARY_PATH", os.path.join(self.package_folder, dir))
 
+    def find_libraries(self, root, file):
+        if file.endswith(".so") and file.startswith("lib"):
+            if root.startswith("./"):
+                dirname = root[2:]
+            else:
+                dirname = root
+            libname = file[3:-3]
+            return (dirname, libname)
+        if file.endswith(".a") and file.startswith("lib"):
+            if root.startswith("./"):
+                dirname = root[2:]
+            else:
+                dirname = root
+            return (dirname, file)
+        return (None, None)
+
+% if pkg.is_maintain:
+    def _revise_renamed_files(self, changed_files):
+        for a_file, b_file in changed_files.items():
+            if a_file != b_file:
+                if a_file != "/dev/null" and b_file != "/dev/null":
+                    os.rename(a_file, b_file)
+                    cmd = f"git rm -f {a_file}"
+                    self.run(cmd)
+                elif a_file != "/dev/null":
+                    cmd = f"git rm -f {a_file}"
+                    self.run(cmd)
+                    continue
+            cmd = f"git add {b_file}"
+            self.run(cmd)
+
+%endif
+    def _configure_cmake(self):
+        if self._cmake is not None:
+            return self._cmake
+        self._cmake = CMake(self)
+        self._cmake.configure()
+        return self._cmake
+
+% if language == "c":
+    def _codegen(self):
+        args = ["-s", "mds/service.json"]
+        gen = GenComp(args)
+        gen.run(self._codegen_version)
+
+% endif
+    def _pre_generate(self):
+        tc = CMakeToolchain(self)
+        tc.preprocessor_definitions["_FORTIFY_SOURCE"] = "2"
+
+        tc.variables["BUILD_MANUFACTURE"] = self.options.manufacture
+        % if len(pkg.design_options) > 0:
+            % for op, _ in pkg.design_options.items():
+        tc.variables["CONAN_DEFS_${op.upper()}"] = self.options.${op}
+            % endfor
+        % endif
+    % if language == "lua":
+        if self.options.enable_luajit:
+            tc.variables["CONAN_DEFS_ENABLE_LUAJIT"] = True
+    % endif
+        if self.options.test:
+            tc.variables["ENABLE_TEST"] = True
+            tc.preprocessor_definitions["ENABLE_TEST"] = True
+        # 向CMAKE传递版本号信息
+        version = self.version.split(".")
+        if len(version) >= 1:
+            tc.variables["PACKAGE_VERSION_MAJOR"] = version[0]
+        if len(version) >= 2:
+            tc.variables["PACKAGE_VERSION_MINOR"] = version[1]
+        if len(version) >= 3:
+            tc.variables["PACKAGE_VERSION_REVISION"] = version[2]
+        # 设置额外编译选项或者重定义CFLAGS CXXFLAGS,也可以设置其他开关
+        # 示例: os.environ['CFLAGS'] = f"{os.getenv('CFLAGS')} -fPIE"
+
+        if self.settings.arch in ["armv8", "x86_64"]:
+            tc.variables["CMAKE_INSTALL_LIBDIR"] = "usr/lib64"
+        else:
+            tc.variables["CMAKE_INSTALL_LIBDIR"] = "usr/lib"
+
+        if self.options.get_safe("asan", False):
+            print("Enable asan flags")
+            asan_flags = "-fsanitize=address -fsanitize-recover=address,all -fno-omit-frame-pointer -fno-stack-protector -O0"
+            tc.extra_cflags.append(asan_flags)
+            tc.extra_cxxflags.append(asan_flags)
+            tc.extra_sharedlinkflag.append("LDFLAGS", "-fsanitize=address")
+            tc.extra_exelinkflag.append("LDFLAGS", "-fsanitize=address")
+
+        # GCOV 标志设置
+        if self.options.get_safe("gcov", False):
+            print("Enable gcov flags")
+            gcov_flags = "-ftest-coverage -fprofile-arcs -fprofile-update=atomic"
+            tc.extra_cflags.append(gcov_flags)
+            tc.extra_cxxflags.append(gcov_flags)
+        # 配合generate添加宏定义
+        tc.variables["CMAKE_TOOLCHAIN_FILE"] = "conan_toolchain.cmake"
+        # rpath配置
+        tc.variables["CMAKE_SKIP_BUILD_RPATH"] = True
+        tc.variables["CMAKE_SKIP_RPATH"] = True
+        tc.variables["CMAKE_SKIP_INSTALL_RPATH"] = True
+        tc.variables["CMAKE_BUILD_WITH_INSTALL_RPATH"] = False
+        tc.variables["CMAKE_INSTALL_RPATH_USE_LINK_PATH"] = False
+        return tc

bmcgo/component/test.py

@@ -408,10 +408,17 @@ class TestComp():
             file.write(write_str)
 
     def add_luacov_to_preloader(self):
+        _, return_code = self.tools.pipe_command([f"file {self.preloader}", "grep ' text$'"], ignore_error=True)
+        if return_code == 0:
+            log.info(f"添加luacov 依赖到 {self.preloader}")
+            insert_str = "require 'luacov'"
+            self.tools.run_command(f"sed -i \"1i {insert_str}\" {self.test_config}")
+            return
+
         preloader_dir = os.path.dirname(self.preloader)
         preloader_wrapper = "app_preloader_wrapper.lua"
         preloader_wrapper_path = os.path.join(preloader_dir, preloader_wrapper)
-        log.info("添加 luacov 依赖到 %s", preloader_wrapper_path)
+        log.info(f"添加 luacov 依赖到 {preloader_wrapper_path}")
         with os.fdopen(os.open(preloader_wrapper_path, os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
                                stat.S_IWUSR | stat.S_IRUSR), 'w') as file:
             preloader_path = Path(self.preloader)

bmcgo/functional/conan_index_build.py

@@ -170,6 +170,9 @@ class BmcgoCommand:
             self.version = split[1]
             if misc.conan_v2():
                 self.version = self.version.lower()
+            # openubmcsdk采用的不是conandata.yml的方式，需特殊处理
+            if self.name == "openubmcsdk":
+                return
             if self.stage != "dev":
                 self.tag_check()
 
@@ -188,16 +191,21 @@ class BmcgoCommand:
         dt_stat = os.environ.get("BINGO_DT_RUN", "off")
         show_log = True if dt_stat == "off" else False
         pkg = self.name + "/" + self.version + "@" + self.user + "/" + self.channel
-        append_cmd = f"-r {self.remote}" if self.remote else ""
-        cmd = "conan create . --name={} --version={} -pr={} {} {} {}".format(
-            self.name, self.version, self.profile, setting, append_cmd, options
-        )
-
-        cmd += " --user={} --channel={}".format(self.user, self.channel)
-        if self.from_source:
-            cmd += " --build=*"
+        # openubmcsdk通过export发布，需特殊处理
+        if self.name == "openubmcsdk":
+            cmd = "conan export . --name {} --version {} --user {} --channel {}".format(
+                self.name, self.version, self.user, self.channel)
         else:
-            cmd += f" --build={self.name}/* --build=missing"
+            append_cmd = f"-r {self.remote}" if self.remote else ""
+            cmd = "conan create . --name={} --version={} -pr={} {} {} {}".format(
+                self.name, self.version, self.profile, setting, append_cmd, options
+            )
+
+            cmd += " --user={} --channel={}".format(self.user, self.channel)
+            if self.from_source:
+                cmd += " --build=*"
+            else:
+                cmd += f" --build={self.name}/* --build=missing"
         self.run_command(cmd, show_log=show_log)
 
         if not self.upload:
@@ -236,11 +244,20 @@ class BmcgoCommand:
             cmd += " --build=*"
         else:
             cmd += " --build=missing"
+        # openubmcsdk通过export发布，需特殊处理
+        if self.name == "openubmcsdk":
+            cmd = "conan export . {}".format(pkg)
         self.run_command(cmd, show_log=show_log)
 
         if not self.upload:
             return
 
+        # openubmcsdk组件无conan info信息，需特殊处理
+        if self.name == "openubmcsdk":
+            cmd = "conan upload {} -r {}".format(pkg, self.remote)
+            self.run_command(cmd)
+            log.info("===>>>Upload package successfully, pkg: {}".format(pkg))
+            return
         cmd = "conan info {} -pr={} -j".format(pkg, self.profile)
         info_json = self.run_command(cmd, shell=True, capture_output=True).stdout
         for line in info_json.split("\n"):

bmcgo/tasks/task_build_conan.py

@@ -278,8 +278,9 @@ class TaskClass(Task):
         self.skip_install_comp = False
         self.only_manifest_yml = False
         self.update_path()
+        self.component_check = ""
         # 记录每个组件的GraphNode信息
-        self.package_info = os.path.join(self.config.rootfs_path, "package_info")
+        self.package_info = os.path.join(self.config.build_path, "package_info")
 
     @property
     def subsys_dir(self):
@@ -320,6 +321,12 @@ class TaskClass(Task):
                     comp = comp.lower()
                 self.add_new_dependencies(comp, file_handler)
                 return
+        # 判断组件是否在openubmcsdk中定义
+        if search[:-1] in self.component_check.openubmcsdk_dict.keys():
+            if misc.conan_v2():
+                comp = comp.lower()
+            self.add_new_dependencies(comp, file_handler)
+            return
         raise errors.ConfigException(f"未知组件: {search}, 请检查配置 !!!")
 
     def update_path(self):
@@ -430,6 +437,16 @@ class TaskClass(Task):
         deps = self.package_dependencies_parse(deps)
         # 由于manifest.yml当中有对于此的新的配置，此处将配置读出，并重新分配
         skynet_with_enable_luajit = False
+        # 获取manifest.yml中"base/sdk"字段值
+        openubmcsdk = self.get_manufacture_config("base/sdk", "")
+        if openubmcsdk:
+            self.add_new_dependencies(openubmcsdk, new_fd)
+        self.component_check = ComponentVersionCheck(
+            manifest_yml="manifest.yml",
+            ibmc_lock=IBMC_LOCK_FILE,
+            community_name="openubmc",
+            openubmcsdk=openubmcsdk
+            )
         for dep in deps:
             conan = dep.get(misc.CONAN)
             if not conan:
@@ -482,6 +499,16 @@ class TaskClass(Task):
         deps = self.package_dependencies_parse(deps)
         # 由于manifest.yml当中有对于此的新的配置，此处将配置读出，并重新分配
         skynet_with_enable_luajit = False
+        # 获取manifest.yml中定义"base/sdk"字段值
+        openubmcsdk = self.get_manufacture_config("base/sdk", "")
+        if openubmcsdk:
+            self.add_new_dependencies(openubmcsdk, new_fd)
+        self.component_check = ComponentVersionCheck(
+            manifest_yml="manifest.yml",
+            ibmc_lock=IBMC_LOCK_FILE,
+            community_name="openubmc",
+            openubmcsdk=openubmcsdk
+            )
         for dep in deps:
             conan = dep.get(misc.CONAN)
             if not conan:
@@ -536,7 +563,6 @@ class TaskClass(Task):
         list.sort(require_list)
         package_info_list = deepcopy(require_list)
         self.run_command(f"rm -rf {dst_file}", sudo=True)
-        self.package_info = f"{self.config.rootfs_path}/{os.path.basename(dst_file)}"
         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:
@@ -685,8 +711,7 @@ class TaskClass(Task):
 
         shutil.copyfile(lockfile, f"{self.conan_install}/conan.lock")
         # 检查使用到的组件是否都在单板目录 manifest.yml 中配置了
-        component_check = ComponentVersionCheck("manifest.yml", lockfile, "openubmc")
-        component_check.run()
+        self.component_check.run()
         self.clean_luac_out()
 
     def install_ibmc(self):
@@ -728,8 +753,7 @@ class TaskClass(Task):
             self.run_command(install_cmd, command_echo=True)
         shutil.copyfile(IBMC_LOCK_FILE, f"{self.conan_install}/conan.lock")
         # 检查使用到的组件是否都在单板目录 manifest.yml 中配置了
-        component_check = ComponentVersionCheck("manifest.yml", IBMC_LOCK_FILE, "openubmc")
-        component_check.run()
+        self.component_check.run()
         self.clean_luac_out()
 
     def deploy(self):
@@ -830,7 +854,6 @@ class TaskClass(Task):
             lock_info = json.load(bmc_lock_fp)
         require_list = lock_info.get("requires")
         self.run_command(f"rm -rf {dst_file}", sudo=True)
-        self.package_info = f"{self.config.rootfs_path}/{os.path.basename(dst_file)}"
         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:

bmcgo/utils/component_post.py

@@ -53,4 +53,3 @@ class ComponentPost():
         else:
             getattr(real_post, func_name)()
             log.info(f"组件 {os.path.basename(self.component_path)} {func_name} 执行完成")
-        sys.path.pop(0)

bmcgo/utils/component_version_check.py

@@ -15,15 +15,16 @@
 功能: 对比manifest.yml生成的组件清单和自动生成的清单是否一致
 注意: 这个文件名为work, 但不继承 Task 类 !!!!!!
 """
-
+import os
 import json
-
+from pathlib import Path
 import yaml
-
 from bmcgo.logger import Logger
 from bmcgo import misc
+from bmcgo.utils.tools import Tools
 
 log = Logger("component_version_check")
+tools = Tools()
 
 
 class ComponentVersionCheck:
@@ -31,18 +32,69 @@ class ComponentVersionCheck:
        conan 目录的 manifest.yml 文件是由单板目录下的 manifest.yml 自动生成的
     """
 
-    def __init__(self, manifest_yml: str, ibmc_lock: str, community_name: str):
+    def __init__(self, manifest_yml: str, ibmc_lock: str, community_name: str, openubmcsdk: str):
         """读取 manifest.yml(conan目录) 文件与 openubmc.lock 文件
 
         Args:
             manifest_yml (str): manifest.yml文件路径
             ibmc_lock (str): openubmc.lock文件路径
         """
-        with open(manifest_yml, "r") as manifest_fp:
+        self.manifest = ""
+        self.manifest_yml = manifest_yml
+        self.ibmc_lock = ibmc_lock
+        self.manifest_dict = {}
+        self.ibmc_lock_dict = {}
+        self.openubmcsdk_comp = openubmcsdk
+        self.openubmcsdk_dict = self.generate_openubmcsdk_dict(self.openubmcsdk_comp)
+        self.community_name = community_name
+
+    @staticmethod
+    def get_cache_path(component):
+        """根据openubmcsdk的包名获取export文件夹路径
+
+        Returns:
+            str: 返回 openubmcsdk 的export路径
+        """
+        if misc.conan_v1():
+            conan_home = Path(os.environ.get("CONAN_HOME", Path.home() / ".conan/data"))
+            openubmcsdk_file = os.path.join(conan_home, component.replace("@", "/"), "export", "requirements.yml")
+        else:
+            conan_home = f"conan cache path {component}"
+            openubmcsdk_file = os.path.join(
+                Tools().run_command(conan_home, capture_output=True).stdout(),
+                "requirements.yml"
+                )
+        return openubmcsdk_file
+
+    def openubmc_folder(self):
+        with open(self.manifest_yml, "r") as manifest_fp:
             self.manifest = yaml.safe_load(manifest_fp)
-        with open(ibmc_lock, "r") as ibmc_lock_fp:
+        with open(self.ibmc_lock, "r") as ibmc_lock_fp:
             self.ibmc_lock = json.load(ibmc_lock_fp)
-        self.community_name = community_name
+
+    def generate_openubmcsdk_dict(self, component) -> dict:
+        """根据 requirement.yml(conan目录) 配置生成 组件名: 组件配置 的字典
+
+        Returns:
+            dict: 返回 组件名: 组件配置 的字典
+        """
+        # component == ""表示manifest.yml未定义"base/sdk"
+        if component == "":
+            return {}
+        openubmcsdk_file = self.get_cache_path(component)
+        if not os.path.isfile(openubmcsdk_file):
+            tools.download_conan_recipes(component, misc.CONAN_REPO)
+            openubmcsdk_file = self.get_cache_path(component)
+        with open(openubmcsdk_file, "r") as openubmcsdk_fp:
+            self.openubmcsdk = yaml.safe_load(openubmcsdk_fp)
+        dependency_list = self.openubmcsdk[misc.CONAN_DEPDENCIES_KEY]
+        openubmc_dict = {x[misc.CONAN].split('/')[0]: x[misc.CONAN].split('@')[0] for x in dependency_list}
+        return openubmc_dict
+    
+    def get_dict(self):
+        self.openubmc_folder()
+        self.manifest_dict = self.generate_manifest_dict()
+        self.ibmc_lock_dict = self.generate_ibmc_lock_dict()
 
     def generate_manifest_dict(self) -> dict:
         """根据 manifest.yml(conan目录) 配置生成 组件名: 组件配置 的字典
@@ -73,16 +125,18 @@ class ComponentVersionCheck:
     def run(self):
         """检查所有组件是否都在 manifest.yml(单板目录下) 中配置了
         """
-        manifest_dict = self.generate_manifest_dict()
-        ibmc_lock_dict = self.generate_ibmc_lock_dict()
         # 这里使用报错退出, 为防止有多个组件未配置, 报错在方法结束后触发
+        self.get_dict()
         report_error = False
-        for key, version in ibmc_lock_dict.items():
-            if key not in manifest_dict.keys():
+        for key, version in self.ibmc_lock_dict.items():
+            if key not in self.manifest_dict.keys() and key not in self.openubmcsdk_dict.keys():
                 log.error(f"{version} 组件没有在manifest中配置!!!!!!")
                 report_error = True
-            elif version != manifest_dict[key]:
-                log.error(f"{version} 组件版本与manifest中配置{manifest_dict[key]}不匹配!!!!!!")
+            elif key in self.openubmcsdk_dict.keys() and version != self.openubmcsdk_dict.get(key, ""):
+                log.error(f"{version} 组件版本与openubmcsdk中配置{self.openubmcsdk_dict[key]}不匹配!!!!!!")
+                report_error = True
+            elif key in self.manifest_dict.keys() and version != self.manifest_dict.get(key, ""):
+                log.error(f"{version} 组件版本与manifest中配置{self.manifest_dict[key]}不匹配!!!!!!")
                 report_error = True
 
         if report_error is True:

{openubmc_bingo-0.6.0.dist-info → openubmc_bingo-0.6.3.dist-info}/METADATA

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

{openubmc_bingo-0.6.0.dist-info → openubmc_bingo-0.6.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=SPNooFrXCHuRYw9163ndcHPQ7NvHXXr7JuuanmyULB8,561
+bmcgo/__init__.py,sha256=h5e5kGxl52AxFfae2B-UH2loCj3NNkmsu_yRg2nr27M,561
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -7,7 +7,7 @@ bmcgo/logger.py,sha256=rcMqJnyQ5Ag3k04KLEskrG8ZJ508OOU_JH4fMFiGOqQ,6644
 bmcgo/misc.py,sha256=w0vzsD7uzrsxTly5Y1viLgYTKHhLP4sxa499XwbqHnU,6986
 bmcgo/worker.py,sha256=OXz5Gam3pmZjgQeoGJrYy73ZrQszCOxk9X19nbeBI_A,15710
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=mJsbNKuSwUzNrHMHOEGkFRfVLYXFaQLZJYqaB1zyf-U,23939
+bmcgo/cli/cli.py,sha256=KiQlFonVx0G7pZkETLKoWAPIZAOBgZgM1YRfeIUbhog,24938
 bmcgo/cli/config.conan2.yaml,sha256=jB0u2jSPpEk6D1-I3xQKnDinnLHVoRV9Z0CA583dotg,289
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -35,7 +35,7 @@ bmcgo/codegen/c/template/server.h.mako,sha256=hZg1U64YKtlUm4wuKRobhjGW8e7rzFu9xg
 bmcgo/codegen/lua/.lua-format,sha256=h6RLqe84SjDqKO1mqoCW7XVtrAwDMTRM1Rj8nwzPGwQ,188
 bmcgo/codegen/lua/Makefile,sha256=wliuAhxhChrpsTnWuOlje3gtW2KRqayIhGRYBkvFi-c,3304
 bmcgo/codegen/lua/__init__.py,sha256=2yU9vzUVQmMJ0qBtNJ-AfKpnOzYZo4wAxlRnpFwgE7M,521
-bmcgo/codegen/lua/codegen.py,sha256=wyzG37xkP8-SfBHi4N9UOuO6CGTtD5iJ7jc17VEiBG0,9064
+bmcgo/codegen/lua/codegen.py,sha256=tyIe6JQ6DGDkRuA7i79HZS59ffHuzBHVjuEQ3BVr3oA,9063
 bmcgo/codegen/lua/proto/Makefile,sha256=rS4nEBwWJEDYAb5XN9S7SfII7RMFb071jh0eh_KJePo,3098
 bmcgo/codegen/lua/proto/ipmi_types.proto,sha256=BX09mymhhPkWqZE1UCVJACpLBeQh1vQN31oBRVVieFY,377
 bmcgo/codegen/lua/proto/types.proto,sha256=_X8JCKZCvO6PfWh6tuWcEqKHROrh46rCZab-OCkfirA,1162
@@ -171,10 +171,10 @@ bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,5
 bmcgo/component/build.py,sha256=gomdHTfscI4p_m2sev2vR9ws55N7ZyuMPNPGv126u9U,11630
 bmcgo/component/component_dt_version_parse.py,sha256=-Rt6i2fZrmYNZGoMqB21D_T9fC7fhhtUFIFvdPsMICM,14188
 bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6oJLXcEA,7933
-bmcgo/component/deploy.py,sha256=FIUMtQkXmbP2XkjzARf1on0wFJST7__k2kIWLEIGGpA,6542
+bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,6544
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
 bmcgo/component/package_info.py,sha256=5iOcS9gFnwBQo3uNivVjgeJw_xP3RDnnBA7nxjOc2vs,14472
-bmcgo/component/test.py,sha256=w4DHIMzgpF9lwJcSsFsS1BSgKEtNRC0FUAhUTRrteZM,45018
+bmcgo/component/test.py,sha256=t_j0K_r5OrZ4T_2io8Kk53xYf0M6bD5yextANttaRKU,45373
 bmcgo/component/analysis/analysis.py,sha256=VJpKdvQmlFQaeKWl3-JggsPq4ioObKOXuaBfzgd74hQ,8497
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
 bmcgo/component/analysis/data_deps.py,sha256=UkuqMhJseZIXMZWC2cJ4csko7rENPlpXJUU0eRWVZNM,16148
@@ -188,15 +188,15 @@ bmcgo/component/analysis/sr_validation.py,sha256=OrgPPjlOoLgRQyD_J6VZXAY0I6gtqGV
 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
-bmcgo/component/template/conanbase.py.mako,sha256=MMZezCl5oFucRraOJt1WjmPL2S7wa4Hzfc7yDfTkW7Q,10949
+bmcgo/component/template/conanbase.py.mako,sha256=dNvbToMSYI7jod7maCpR0PBizvVoQHvXxglmN9LNflg,10984
 bmcgo/component/template/conanfile.deploy.py.mako,sha256=zpxluBjUFmJHfFrnBknxZ3cv3cxcqzJuGh2eN0uMXZA,889
-bmcgo/component/template_v2/conanbase.py.mako,sha256=Zx4e4wmVl9TGDrTBVluQzQWh5VXy9yr4b8F0y8MLmVA,14650
+bmcgo/component/template_v2/conanbase.py.mako,sha256=X27JBoMWq_kUaxJpNHLuS9idmDENGmQNTI4nHg0ReJU,15599
 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/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=GFHs4KRUgieYK9gK7-tLSDattRXBjVwEV6I4j95MeTs,11350
+bmcgo/functional/conan_index_build.py,sha256=wQdrXA_ItIN0pO7If-21HyQftJsR76oahX-h4BBgQs4,12249
 bmcgo/functional/config.py,sha256=ZQ-a9hegI0cV41iTo7t49ryBeUH4wPJ-qkVvWp8toV4,10824
 bmcgo/functional/csr_build.py,sha256=JTIvbjn08xvdo7aUhKW4giwPayojyIeQolT14SuwJRo,41146
 bmcgo/functional/deploy.py,sha256=2NsxCpoZjL4jTyRpbIp20-EKKbQkQe-Hsm20uxHK2Xc,10677
@@ -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=ayh9mxKKLtk2XKzjqXOl6Pe8fcg7S1nTks153hKT9Rw,18321
-bmcgo/tasks/task_build_conan.py,sha256=pm8PIrlVyLvfXNaft5z8J3gcDmCDSclkGf7Wgdod4Q8,49263
+bmcgo/tasks/task_build_conan.py,sha256=E-T64By3nGyjLqmntvxNPlcvNl1E4cTClaASPF5wGDo,50075
 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=epBxxrYFPgoTzpBgPzSRXcUs-ia_BJWsLGflylEJS7I,6614
@@ -243,8 +243,8 @@ bmcgo/utils/basic_enums.py,sha256=L5VtHtzSvs6duAnphgqDGXX80Wit3Y7DjMlpi9MCxyI,13
 bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
 bmcgo/utils/build_conans.py,sha256=1kugt48GRf2P-IilkxFSBTl3i8_Xk5EB4cN2LeuZZJY,9330
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
-bmcgo/utils/component_post.py,sha256=QS1uBW8abE_Ok9G_5IzKLG6kwA7DAx1Yoqo_wvgNeAc,2354
-bmcgo/utils/component_version_check.py,sha256=93K_YqrWfG5YnAU9UP84Sq0NmUBaKMO2ZoVadgHKFcs,3723
+bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
+bmcgo/utils/component_version_check.py,sha256=BKuQG49cGBTBt4oIODMzjjeKH0TIV2-4lk2jmYaLTjk,6264
 bmcgo/utils/config.py,sha256=xCljGFk7m8IVsCSchJDAzollZEZyXoMDLIgqRMepL-I,49952
 bmcgo/utils/fetch_component_code.py,sha256=gUjZX1m6tzUaleKrA3V42gbOFnNtepZaxItATc6nQa4,11159
 bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
@@ -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.0.dist-info/METADATA,sha256=ip9cIeNQuvo7mIj7-TCXL1efBEdRx1Ph5oQrk_UVe6A,1009
-openubmc_bingo-0.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.0.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.0.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.0.dist-info/RECORD,,
+openubmc_bingo-0.6.3.dist-info/METADATA,sha256=gHEn92CmcZZoNsfhXoj_Ll4KihlK7L1mS44JFFTfUEw,1009
+openubmc_bingo-0.6.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.3.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.3.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.3.dist-info/RECORD,,