openubmc-bingo 0.6.17__py3-none-any.whl → 0.6.24__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.17'
+__version__ = '0.6.24'

bmcgo/cli/cli.py

@@ -312,11 +312,18 @@ class Command(object):
         studio_version = self._bmc_studio_version()
         if studio_version:
             log.info("bmc-studio 版本为: %s", studio_version)
+    
+    def conan_init(self):
+        if misc.conan_v2():
+            tools.run_command("conan profile detect --force")
+        else:
+            tools.run_command("conan config init")
+            tools.run_command("conan config set general.revisions_enabled=1")
 
     def _check_conan_profile(self):
         profile_dir = os.path.join(tools.conan_home, "profiles")
         if not os.path.isdir(profile_dir):
-            os.makedirs(profile_dir)
+            self.conan_init()
 
         if misc.conan_v2():
             bingo_profiles = "/usr/share/bingo/profiles_for_conan2"

bmcgo/codegen/lua/script/render_utils/model_lua.py

@@ -487,7 +487,7 @@ class ModelLuaUtils(Base, Utils):
         for key, value in input_dict.items():
             if isinstance(value, dict):
                 _ = self.remove_description(value)
-            if key == 'description':
+            if key in ['description', 'constraint', 'example']:
                 keys_to_delete.append(key)
         for key in keys_to_delete:
             del input_dict[key]

bmcgo/tasks/task.py

@@ -33,7 +33,7 @@ from bmcgo.functional.simple_sign import BmcgoCommand as SimpleSign
 
 class Task(Process):
     name = "WorkBase"
-    timeout = 1200
+    timeout = 1800
     description = "基础类"
     work_name = ""
     manifest_obj = None
@@ -54,7 +54,7 @@ class Task(Process):
         # OPENUBMC_DEFAULT_VENDOR环境变量未设置时，使用openubmc
         self.vendor = self.get_manufacture_config("base/vendor", misc.vendor())
         os.environ["OPENUBMC_PRODUCT_VENDOR"] = self.vendor
-        self.customization_dir = os.path.join(self.config.build_path, "customizations")
+        self.conan_install = os.path.join(self.config.build_path, "conan_install")
 
     @property
     def conan_home(self):
@@ -331,14 +331,17 @@ class Task(Process):
 
     def _component_cust_action_v2(self, action: str):
         profile, _ = self.get_profile_config()
-        for name in os.listdir(self.customization_dir):
-            path_dir = os.path.join(self.customization_dir, name)
+        for name in os.listdir(self.conan_install):
+            path_dir = os.path.join(self.conan_install, name)
+            cust = os.path.join(path_dir, "include", "customization.py")
+            if not os.path.isfile(cust):
+                continue
             self.info(f"开始执行组件 {name} 定制化 {action}，定制脚本 {path_dir}/include/customization.py")
             post = ComponentPost(self.config, path_dir, profile)
             post.post_work(os.getcwd(), action)
 
     def _component_cust_action_v1(self, action: str):
-        conan_install = f"{self.config.build_path}/conan_install"
+        conan_install = self.conan_install
 
         # 优先处理rootfs定制化脚本
         comps = ["rootfs"]

bmcgo/tasks/task_build_conan.py

@@ -333,8 +333,6 @@ class TaskClass(Task):
     def update_path(self):
         # conan source folder
         self.conan_source = os.path.join(self.config.build_path, misc.community_name())
-        # conan install folder
-        self.conan_install = os.path.join(self.config.build_path, "conan_install")
         # openubmc install folder
         self.openubmc_ins_dir = os.path.join(self.conan_install, misc.community_name())
         # openubmc top rootfs folder
@@ -563,6 +561,7 @@ class TaskClass(Task):
         require_list = list(bundle.keys())
         list.sort(require_list)
         package_info_list = deepcopy(require_list)
+        dst_file = os.path.join(self.config.rootfs_path, dst_file)
         self.run_command(f"rm -rf {dst_file}", sudo=True)
         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:
@@ -572,7 +571,8 @@ class TaskClass(Task):
                 else:
                     package_info_list.remove(package)
             fp.close()
-        self.run_command(f"cp -df {self.package_info} {dst_file}", sudo=True)
+        os.makedirs(os.path.dirname(dst_file), exist_ok=True)
+        self.run_command(f"cp -f {self.package_info} {dst_file}", sudo=True)
 
     def sensitive_data_conf_gen(self, comps, dst_file):
         self.run_command(f"rm -rf {dst_file}", sudo=True)
@@ -699,6 +699,8 @@ class TaskClass(Task):
         graph_cmd = f"conan graph info . {base_cmd} -f json --lockfile={self.lockfile} --out-file={self.graphfile}"
         self.run_command(graph_cmd)
         self.success(f"start build dependency packages of {self.config.board_name}")
+        if self.skip_install_comp:
+            return
         bcp = BuildConans(self.graphfile, self.lockfile, base_cmd, self.config.from_source, self.config.log_path)
         bcp.build()
 
@@ -743,11 +745,13 @@ class TaskClass(Task):
                 self.run_command(install_cmd, command_echo=True, warn_log="缓存安装失败，可能缺少某个依赖项制品，开始从源码构建缺失的软件包")
             except Exception:
                 ret = -1
+        shutil.copyfile(self.lockfile, f"{self.conan_install}/conan.lock")
+        if self.skip_install_comp:
+            return
         if ret != 0:
             bundle_parse = ConanLockParse("openubmc.bundle", self)
             bundle_parse.conan_parallel_build(cmd, self.config.build_path)
             self.run_command(install_cmd, command_echo=True)
-        shutil.copyfile(self.lockfile, f"{self.conan_install}/conan.lock")
         # 检查使用到的组件是否都在单板目录 manifest.yml 中配置了
         self.component_check.run()
         self.clean_luac_out()
@@ -848,14 +852,17 @@ class TaskClass(Task):
     def package_info_gen_v2(self, bmc_lock, dst_file):
         with open(bmc_lock, "r") as bmc_lock_fp:
             lock_info = json.load(bmc_lock_fp)
-        require_list = lock_info.get("requires")
-        self.run_command(f"rm -rf {dst_file}", sudo=True)
+        require_list = lock_info.get("requires", [])
         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:
                 fp.write(f"{package}\n")
             fp.close()
-        self.run_command(f"cp -df {self.package_info} {dst_file}", sudo=True)
+        dst_file = os.path.join(self.config.rootfs_path, dst_file)
+        self.run_command(f"rm -rf {dst_file}", sudo=True)
+        os.makedirs(os.path.dirname(dst_file), exist_ok=True)
+        self.run_command(f"cp -f {self.package_info} {dst_file}", sudo=True)
+
 
     def sensitive_data_conf_gen_v2(self, dst_file):
         self.run_command(f"rm -rf {dst_file}", sudo=True)
@@ -964,19 +971,19 @@ class TaskClass(Task):
         rootfs.package_folder = os.path.join(self.conan_install, misc.community_name())
         self.graph_nodes[misc.community_name()] = rootfs
 
-    def make_customization_symlinks(self):
-        if os.path.isdir(self.customization_dir):
-            self.run_command(f"rm -rf {self.customization_dir}")
-        self.run_command(f"mkdir -p {self.customization_dir}")
+    def copy_component_include_dirs(self):
         for name, node in self.graph_nodes.items():
+            if node.package_folder.startswith(self.conan_install):
+                continue
             cust = os.path.join(node.package_folder, "include", "customization.py")
             if not os.path.isfile(cust):
                 continue
-            os.symlink(node.package_folder, os.path.join(self.customization_dir, name))
+            comp_dir = os.path.join(self.conan_install, name)
+            shutil.copytree(node.package_folder, comp_dir)
 
     def package_v2(self):
         self.update_graph_nodes()
-        self.make_customization_symlinks()
+        self.copy_component_include_dirs()
         self.run_command(f"sudo rm -rf {self.config.rootfs_path}")
         os.makedirs(self.config.rootfs_path)
         profile, _ = self.get_profile_config()
@@ -1068,8 +1075,9 @@ class TaskClass(Task):
             self.run_command(cmd)
             cmd = f"cp temp/.deploy/luajit/usr/lib64/liblua.so {conan_bin}"
             self.run_command(cmd)
-            cmd = f"cp -r temp/.deploy/luajit/usr/bin/jit {conan_bin}"
-            self.run_command(cmd)
+            if os.path.isfile("temp/.deploy/luajit/usr/bin/jit"):
+                cmd = f"cp -r temp/.deploy/luajit/usr/bin/jit {conan_bin}"
+                self.run_command(cmd)
             self.link(luac, luac_back)
         # 仅在覆盖率使能场景下，对luac进行打桩
         if self.config.enable_arm_gcov:
@@ -1088,6 +1096,10 @@ class TaskClass(Task):
         if self.only_manifest_yml:
             return
         self.package_lock()
+        if misc.conan_v2():
+            self.package_info_gen_v2(self.lockfile, "etc/package_info")
+        else:
+            self.package_info_gen(f"{self.conan_source}/all/openubmc.bundle", "etc/package_info")
         if not self.skip_package:
             self.package()
 

bmcgo/utils/fetch_component_code.py

@@ -45,6 +45,8 @@ class FetchComponentCode:
     def resolve_version_range(component_name, version_range):
         cmd = f"conan info '{version_range}' --package-filter={component_name}/*" \
              f" -r {misc.conan_remote()} --only None 2>/dev/null"
+        if misc.conan_v2():
+            cmd = f"conan graph info --requires='{version_range}' --filter {component_name}"
         ret, output = subprocess.getstatusoutput(cmd)
         output = output.strip()
         if ret != 0 or not output:

bmcgo/utils/tools.py

@@ -645,7 +645,7 @@ class Tools():
         error_log = kwargs.get("error_log")
         warn_log = kwargs.get("warn_log")
         log_name = kwargs.get("log_name")
-        timeout = kwargs.get("timeout", 1200)
+        timeout = kwargs.get("timeout", 1800)
         capture_output = kwargs.get("capture_output", False)
         if command_key:
             key = command_key + ":"
@@ -775,7 +775,7 @@ class Tools():
         tmpdir = TemporaryDirectory()
         graph_file = os.path.join(tmpdir.name, "package.json")
         cmd = f"conan install --requires='{package}' {install_args}"
-        cmd += f" -f json --out-file={graph_file}"
+        cmd += f" -f json --out-file={graph_file} -of temp"
         self.run_command(cmd, ignore_error=False)
         return self.get_package_folder_from_graph_file(graph_file, package)
 

{openubmc_bingo-0.6.17.dist-info → openubmc_bingo-0.6.24.dist-info}/METADATA

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

{openubmc_bingo-0.6.17.dist-info → openubmc_bingo-0.6.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=-ZiFjQB0Op9berOvBtulbZEJLN5Qomt1CPbhMxDRZfA,562
+bmcgo/__init__.py,sha256=BXSf7vrJJ8RdepowzFwMLtfu3srWxlFdp6BQdVXPvQ0,562
 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=O1E4QnAF453rj1jnfLkXfXNDPyZ6h6ry8_eoJiW7mXY,26859
+bmcgo/cli/cli.py,sha256=MY-DIvJ4q0roWfshZHkPaG1VGoWWrQcKDYx5ahE-IRg,27116
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -91,7 +91,7 @@ bmcgo/codegen/lua/script/render_utils/ipmi_message_lua.py,sha256=Y-5pXMfAPDZqqoA
 bmcgo/codegen/lua/script/render_utils/mdb_lua.py,sha256=gKX_GUkIbYbbviBw9cEO3pfTwoLWurczYFmoOoWA1Us,6141
 bmcgo/codegen/lua/script/render_utils/message_lua.py,sha256=ZHJy35iJir1O149dafZnl-oEdU89-eP6VIeQmKjh9D8,1155
 bmcgo/codegen/lua/script/render_utils/messages_lua.py,sha256=eAe46JU1AJxfpifQCnioD1jxfDhfc-DLGRy8CmwCfBg,4948
-bmcgo/codegen/lua/script/render_utils/model_lua.py,sha256=LfNXUxpaMp2AcjRPg5Hgdr-U6GI79g5_zvpkdVP5NGA,18429
+bmcgo/codegen/lua/script/render_utils/model_lua.py,sha256=kxlPkPboUKtUfK2HTWakmgKMFLLZ3UofPouWvng7UWY,18456
 bmcgo/codegen/lua/script/render_utils/old_model_lua.py,sha256=OFUPJOaiXDjXpknbh6Pw0TNC1dUVtjPbuIs-3fSN7p4,15611
 bmcgo/codegen/lua/script/render_utils/plugin_lua.py,sha256=-_r-MqjDNnoYel6zdsNSkqYI3w1DKJPwJy5Vsevl33s,1481
 bmcgo/codegen/lua/script/render_utils/redfish_proto.py,sha256=lAVo9pPxkc7Iv22enuqCOJVTFy8_63C57iADjzYWz5g,3130
@@ -223,8 +223,8 @@ bmcgo/target/publish.yml,sha256=WvaJAUZ0_6CMV3O1p1t6dagHe-DdLcXqLxKP11_ki1E,1615
 bmcgo/tasks/__init__.py,sha256=VapgzhPMmB7dzPIRohoVm1jjfVn_v97cYNCRmkxScaU,539
 bmcgo/tasks/download_buildtools_hm.py,sha256=f4UxStARc8Z8DnT_5O6ONajQ7P0sKyJ8brixr43fHVQ,5988
 bmcgo/tasks/misc.py,sha256=GK_bSDLGZW0FxywB2ICG1iIEz2y2QoCb1YQQk8SYOIA,711
-bmcgo/tasks/task.py,sha256=ayh9mxKKLtk2XKzjqXOl6Pe8fcg7S1nTks153hKT9Rw,18321
-bmcgo/tasks/task_build_conan.py,sha256=euVymOxVKwCv4FJMAh_dPU-Ii0WujWIXdg_I5l8Cj-A,49970
+bmcgo/tasks/task.py,sha256=w8tdU5NwoUfVF4xKFvSzcCWCf0FGTBHJAToNLlP0p4w,18424
+bmcgo/tasks/task_build_conan.py,sha256=kzUcYhXN5ItQrWLmzNBkhiaA5NzO7KbW8PNtm-Nrw5g,50458
 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
@@ -246,13 +246,13 @@ bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPP
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
 bmcgo/utils/config.py,sha256=xCljGFk7m8IVsCSchJDAzollZEZyXoMDLIgqRMepL-I,49952
-bmcgo/utils/fetch_component_code.py,sha256=gUjZX1m6tzUaleKrA3V42gbOFnNtepZaxItATc6nQa4,11159
+bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
 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=ggG3_sS5FOcihv5SUqIkcDVDPR6eqGm1swrXGbBfDf0,32471
+bmcgo/utils/tools.py,sha256=NrYd4bNzRiBGu7FklN6PT1gj-sdqUWB_lj11Q7TjI8Y,32480
 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
@@ -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.17.dist-info/METADATA,sha256=qPEuNbLIleXDMDQrn7OmQrjBGBvdyKM4gd1iJF9yxh0,1010
-openubmc_bingo-0.6.17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.17.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.17.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.17.dist-info/RECORD,,
+openubmc_bingo-0.6.24.dist-info/METADATA,sha256=aVekPJxRxrfTvjLNpuaqdu3ziQW4GxLomcFhfw0zX8Q,1010
+openubmc_bingo-0.6.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.24.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.24.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.24.dist-info/RECORD,,