openubmc-bingo 0.6.27__py3-none-any.whl → 0.6.28__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.27'
+__version__ = '0.6.28'

bmcgo/tasks/task_build_conan.py

@@ -714,13 +714,17 @@ class TaskClass(Task):
             for rrid, revision in recipe.get("revisions", {}).items():
                 for pid, _ in revision.get("packages", {}).items():
                     cmd = f"conan cache path {name}#{rrid}:{pid}"
-                    path = self.run_command(cmd, capture_output=True).stdout.strip()
-                    if not os.path.isdir(path):
+                    result = self.run_command(cmd, capture_output=True, ignore_error=True)
+                    ret_code = result.returncode
+                    path = result.stdout.strip()
+                    if ret_code != 0 or not os.path.isdir(path):
                         cmd = f"conan remove {name}#{rrid}:{pid} -c"
                         self.run_command(cmd)
                 cmd = f"conan cache path {name}#{rrid}"
-                path = self.run_command(cmd, capture_output=True).stdout.strip()
-                if not os.path.isdir(path):
+                result = self.run_command(cmd, capture_output=True, ignore_error=True)
+                ret_code = result.returncode
+                path = result.stdout.strip()
+                if ret_code != 0 or not os.path.isdir(path):
                     cmd = f"conan remove {name}#{rrid} -c"
                     self.run_command(cmd)
 
@@ -869,6 +873,8 @@ class TaskClass(Task):
         os.makedirs(inner_path, exist_ok=True)
         self.run_command(f'cp -f {self.lockfile} {os.path.join(inner_path, f"package_{self.config.board_name}.lock")}')
         self.run_command(f'cp -f {self.lockfile} {os.path.join(self.config.output_path, f"package.lock")}')
+        if misc.conan_v2():
+            self.run_command(f'cp -f {self.graphfile} {os.path.join(self.config.output_path, f"graph.info")}')
 
     def copy_components(self, comps: list, profile):
         # 优先处理rootfs
@@ -1118,8 +1124,8 @@ class TaskClass(Task):
             self.run_command(cmd)
             cmd = f"cp temp/.deploy/luajit/usr/lib64/liblua.so {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}"
+            if os.path.isdir("temp/.deploy/luajit/usr/bin/jit"):
+                cmd = f"cp -rf temp/.deploy/luajit/usr/bin/jit {conan_bin}"
                 self.run_command(cmd)
             self.link(luac, luac_back)
         # 仅在覆盖率使能场景下，对luac进行打桩

{openubmc_bingo-0.6.27.dist-info → openubmc_bingo-0.6.28.dist-info}/METADATA

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

{openubmc_bingo-0.6.27.dist-info → openubmc_bingo-0.6.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=oqZ8oOARtejTeAecTilQ7hon25T3svORSMnhnL6HQwY,562
+bmcgo/__init__.py,sha256=Bl--4YJlK5Qc6SygOJsgAH2VC3x0DEF59ZLKHXVlTXc,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -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=EpxDBOSmj9YIDSF8ifG0lREIAhOfQbWjt29lmO6mI1g,52546
+bmcgo/tasks/task_build_conan.py,sha256=T16Jq77KVxxaHVzzTMj3TeFDFPXM7rlvW5f04BQdSiE,52919
 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
@@ -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.27.dist-info/METADATA,sha256=RJul5-nRe2BswGFKly97xf_nQAlfpNu2_AeO1OOOAs0,1010
-openubmc_bingo-0.6.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.27.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.27.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.27.dist-info/RECORD,,
+openubmc_bingo-0.6.28.dist-info/METADATA,sha256=6BRrodkfgYypyYp9oglx1y6RHH78P2oX2TbdUXagHwk,1010
+openubmc_bingo-0.6.28.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.28.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.28.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.28.dist-info/RECORD,,