openubmc-bingo 0.6.21__py3-none-any.whl → 0.6.25__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.21'
+__version__ = '0.6.25'

bmcgo/cli/cli.py

@@ -342,6 +342,8 @@ class Command(object):
         if not rtos_version:
             log.info(f"未检测到/opt/RTOS目录下的构建工具，可能未安装构建工具，请正确安装构建工具（可以manifest仓执行init.py或{misc.tool_name()} build）")
             return
+        if not os.path.isdir(bingo_profiles):
+            return
         for file in os.listdir(bingo_profiles):
             os.makedirs(profile_dir, exist_ok=True)
             src_file = os.path.join(bingo_profiles, file)

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/component/build.py

@@ -79,7 +79,7 @@ class BuildComp():
         options = ""
         if self.info.enable_luajit:
             luac_path = os.path.join(conan_bin, "luajit")
-            options = "-0 skynet:enable_luajit=True"
+            options = "-o skynet:enable_luajit=True"
             skynet_flag += "_luajit"
         else:
             skynet_flag += "luac"

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

bmcgo/tasks/task_build_conan.py

@@ -407,6 +407,21 @@ class TaskClass(Task):
         file_handler.write("  - conan: \"{}\"\n".format(conan))
         self.success(f"获取到依赖: {conan}")
         self.depdencies.append(conan)
+        self.profile_tools_change(conan)
+
+    def profile_tools_change(self, pkg):
+        if pkg.startswith("luajit/"):
+            cmd = f"sed -i 's|^user.tools:luajit=.*|user.tools:luajit={pkg}|g'"
+        elif pkg.startswith("skynet/"):
+            cmd = f"sed -i 's|^user.tools:skynet=.*|user.tools:skynet={pkg}|g'"
+        else:
+            return
+        profile_file = os.path.join(self.tools.conan_profiles_dir, "profile.ini")
+        if os.path.isfile(profile_file):
+            self.run_command(f"{cmd} {profile_file}")
+        profile_file = os.path.join(self.tools.conan_profiles_dir, "profile.luajit.ini")
+        if os.path.isfile(profile_file):
+            self.run_command(f"{cmd} {profile_file}")
 
     def merge_manifest_v2(self):
         comps = []
@@ -561,6 +576,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:
@@ -570,7 +586,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)
@@ -697,6 +714,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()
 
@@ -741,11 +760,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()
@@ -846,14 +867,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)
@@ -1066,8 +1090,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:
@@ -1086,6 +1111,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/build_conans.py

@@ -94,7 +94,8 @@ class BuildConans(object):
         if self.force_build:
             cmd += f" --build=\"{node.name}/*\""
         try:
-            for i in range(1, 2):
+            # 最多重试5次
+            for i in range(1, 5):
                 logfile = f"{self.log_dir}/conan_build_{node.name}.log"
                 log.debug(f">>>> {cmd}")
                 log.info(f">>>> build {node.ref} start, logfile: {logfile}")
@@ -116,12 +117,18 @@ class BuildConans(object):
                             cmd += f" --build=\"{node.name}/*\""
                             continue
 
-                        log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
                         f.seek(0)
                         conan_log = f.read()
+                        # conan的缓存数据库不支持并发访问，会概率性存在数据库锁错误，当前通过重试解决
+                        if "sqlite3.OperationalError: database is locked" in conan_log:
+                            log.info("rebuild because database is locked")
+                            continue
+                        log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
                         log.error(conan_log)
                         log.error(f"================== {node.name} 构建失败日志结束位置 ==================")
                         raise errors.BmcGoException(f"================== {node.name} 构建失败 ==================")
+                    else:
+                        break
             log.success(f"<<<< build {node.ref} finished")
         except Exception as e:
             self.exception = e

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.21.dist-info → openubmc_bingo-0.6.25.dist-info}/METADATA

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

{openubmc_bingo-0.6.21.dist-info → openubmc_bingo-0.6.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=Oam3SkOb8QiCRykhhHrp4EPrCj2Lo20xJkOI7vXC8p0,562
+bmcgo/__init__.py,sha256=UIcAX3HFWIv4SVR6dvGzKjsZ-Hcy6x6_GwpA6css2D4,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=MY-DIvJ4q0roWfshZHkPaG1VGoWWrQcKDYx5ahE-IRg,27116
+bmcgo/cli/cli.py,sha256=pgkIjjo3owY3tNbujIUGxJshanVElrwJ0gsXj8X3BXI,27181
 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
@@ -168,7 +168,7 @@ bmcgo/codegen/lua/v1/templates/apps/service.lua.mako,sha256=wd_NJtiSSMbR-lxEqv-r
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako,sha256=msdj2SygZvV3RIEHLeVDfZvOzZ99Yy27SwPVrFVVcpc,1242
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_obj.lua.mako,sha256=oCzx2u3bjvCdNKX5oC8j6Q-Zb21q6SFCqd14_VzrWvo,349
 bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/component/build.py,sha256=7ZYTxVOVO6T1caP3KCmyJ8yWE992g8gc6yU2f-bZx5s,12851
+bmcgo/component/build.py,sha256=HWjgY1L1AXL7ndA35PKMFfweGSd8xXTRjY-ULW9ngGw,12851
 bmcgo/component/component_dt_version_parse.py,sha256=-Rt6i2fZrmYNZGoMqB21D_T9fC7fhhtUFIFvdPsMICM,14188
 bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6oJLXcEA,7933
 bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,6544
@@ -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=X1CFVHIjS9ej9S3euZtb7yiMdTCizuLvXbgZntT_duo,18424
-bmcgo/tasks/task_build_conan.py,sha256=o08zhFXvipn-8mTzNtlTYu3m_a2rNr9rRDvsNC0Raxg,49803
+bmcgo/tasks/task.py,sha256=w8tdU5NwoUfVF4xKFvSzcCWCf0FGTBHJAToNLlP0p4w,18424
+bmcgo/tasks/task_build_conan.py,sha256=cpGFUgwzp2WmrZr9ISFdPUDO5kPuEWqJWTFFdL_1MLk,51173
 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
@@ -241,7 +241,7 @@ bmcgo/tasks/conan/conanfile.py,sha256=MI6c2QNKixrkA5Tx4i9EKw7bZ20GVDIKgkaMwNHQKc
 bmcgo/utils/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/basic_enums.py,sha256=L5VtHtzSvs6duAnphgqDGXX80Wit3Y7DjMlpi9MCxyI,1348
 bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
-bmcgo/utils/build_conans.py,sha256=lEaZFCTjRc8pLWXWw71n7zl4zwmWg1s561Atn-Y32HA,9748
+bmcgo/utils/build_conans.py,sha256=3uGn9MWlW3d8WNKZQPs4rEd6E6KxP_eyqSxSlSQQG4o,10172
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
@@ -252,7 +252,7 @@ bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c
 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.21.dist-info/METADATA,sha256=fd5aaiA7Dbttae0qPRFYfbNkBEtgm-gjWz_ycuHc_7o,1010
-openubmc_bingo-0.6.21.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.21.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.21.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.21.dist-info/RECORD,,
+openubmc_bingo-0.6.25.dist-info/METADATA,sha256=9npzn3E3oo6oiNlQGepfcjj0msWe2jDEmSlhBefEm5E,1010
+openubmc_bingo-0.6.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.25.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.25.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.25.dist-info/RECORD,,