openubmc-bingo 0.6.24__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.24'
+__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/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_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 = []

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

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=BXSf7vrJJ8RdepowzFwMLtfu3srWxlFdp6BQdVXPvQ0,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
@@ -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
@@ -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=w8tdU5NwoUfVF4xKFvSzcCWCf0FGTBHJAToNLlP0p4w,18424
-bmcgo/tasks/task_build_conan.py,sha256=kzUcYhXN5ItQrWLmzNBkhiaA5NzO7KbW8PNtm-Nrw5g,50458
+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
@@ -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.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,,
+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,,