openubmc-bingo 0.6.2__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.2'
+__version__ = '0.6.3'

bmcgo/component/template_v2/conanbase.py.mako

@@ -12,7 +12,7 @@
 import os
 import concurrent.futures
 import urllib3
-% if pkg.is_maintain:
+% if not pkg.is_maintain:
 import time
 % endif
 % if pkg.is_maintain:
@@ -136,7 +136,7 @@ class ConanBase(ConanFile):
     def source(self):
         git = Git(self)
         sources = self.conan_data["sources"][self.version]
-    % if pkg.is_maintain:
+    % if not pkg.is_maintain:
         if sources["url"] and sources["branch"]:
             git.fetch_commit(url=sources["url"], commit=sources["branch"].split("/")[-1])
         else:

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/tasks/task_build_conan.py

@@ -280,7 +280,7 @@ class TaskClass(Task):
         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):
@@ -563,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:
@@ -855,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)

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=haErf6QOlKncKJVqp4-EqaC8LAT5CkLYmXdbp3VqhHc,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
@@ -174,7 +174,7 @@ bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6o
 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
@@ -190,7 +190,7 @@ bmcgo/component/coverage/c_incremental_cov_report.template,sha256=FPhK1DZtmWsjDx
 bmcgo/component/coverage/incremental_cov.py,sha256=Uf-UdY4CW9rpP4sbURkCXBWyYMXWaG3R1Pyo3cDNvcQ,16859
 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=Xp8EqMHZbjzX9bbq_F1Qm3VV73ZxhSxDS6qB2HIeKvY,15591
+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
@@ -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=GZFHpjRdWvzdwS546q6waOLhzZn862kPTfxl5EdwFhw,50248
+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,7 +243,7 @@ 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_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
@@ -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.2.dist-info/METADATA,sha256=HYgd-dHJ8zX3FYtT7IGwceCGCVAAVu67Rcj_Hp2i4OM,1009
-openubmc_bingo-0.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.2.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.2.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.2.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,,