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

bmcgo/cli/cli.py

@@ -242,8 +242,9 @@ class Command(object):
         """HIDDEN: entry point for executing commands, dispatcher to class
         methods
         """
-        if not self._check_conan() or not self._check_conan_profile():
+        if not self._check_conan():
             return 1
+        self._check_conan_profile
         try:
             command = args[0][0]
         except IndexError:  # No parameters
@@ -313,13 +314,12 @@ class Command(object):
     def _check_conan_profile(self):
         profile_dir = os.path.join(tools.conan_home, "profiles")
         if os.path.isdir(profile_dir):
-            return True
+            return
 
         if misc.conan_v2():
-            log.warning("检测到依赖conan2.0但未正确初始化，请切换到产品仓执行一次构建，以安装和配置工具链")
+            log.info("检测到依赖conan2.0但未正确初始化，需要切换到产品仓执行一次构建，以安装和配置工具链")
         else:
-            log.warning("检测到依赖conan1.0但未正确初始化，请切换到产品仓执行一次构建，以安装和配置工具链")
-        return False
+            log.info("检测到依赖conan1.0但未正确初始化，需要切换到产品仓执行一次构建，以安装和配置工具链")
 
     def _check_conan(self):
         need_conan_v2 = False

bmcgo/component/build.py

@@ -289,6 +289,7 @@ class BuildComp():
         if os.path.isdir("test_package"):
             cmd = [misc.CONAN, "create"]
             cmd += self.info.cmd_base.split()
+            cmd += ["--build=missing"]
             cmd += ["-tf", "test_package"]
             Helper.run(cmd)
 

bmcgo/component/test.py

@@ -412,7 +412,7 @@ class TestComp():
         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}")
+            self.tools.run_command(f"sed -i \"1i {insert_str}\" {self.preloader}")
             return
 
         preloader_dir = os.path.dirname(self.preloader)

bmcgo/tasks/task_build_conan.py

@@ -699,7 +699,7 @@ 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}")
-        bcp = BuildConans(self.graphfile, self.graphfile, base_cmd, self.config.from_source, self.config.log_path)
+        bcp = BuildConans(self.graphfile, self.lockfile, base_cmd, self.config.from_source, self.config.log_path)
         bcp.build()
 
         cmd = f"conan create . {base_cmd} --build=missing"

{openubmc_bingo-0.6.7.dist-info → openubmc_bingo-0.6.11.dist-info}/METADATA

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

{openubmc_bingo-0.6.7.dist-info → openubmc_bingo-0.6.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=1tsWug6hVxYeVnfDiz-kIdLcf8bphjLcfRl0l-F-TTM,561
+bmcgo/__init__.py,sha256=f9jG-AQzuUOV5FcUHlWTuKHojRVWOYy0WRWLjzY7f68,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=kuNrwKpg5Zbi9TG0jhlObkAJ3xJtj35sBIh-q2bmlyU,25583
+bmcgo/cli/cli.py,sha256=KhencIa6l77zCkf9ssxCG3kmK1O2u0RsK-Ge_AJly-Y,25556
 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,13 +168,13 @@ 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=4cusLnULxD42DhIICDdtB-W8wbBBt0CeOhZinRW04I4,12812
+bmcgo/component/build.py,sha256=7ZYTxVOVO6T1caP3KCmyJ8yWE992g8gc6yU2f-bZx5s,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
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
 bmcgo/component/package_info.py,sha256=5iOcS9gFnwBQo3uNivVjgeJw_xP3RDnnBA7nxjOc2vs,14472
-bmcgo/component/test.py,sha256=t_j0K_r5OrZ4T_2io8Kk53xYf0M6bD5yextANttaRKU,45373
+bmcgo/component/test.py,sha256=kNfqBSiBoZDQoyFjymIEJt9ohXi3_2rELsvyxCzpLNk,45371
 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
@@ -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=u0Qwp_R9nFpAc5ZAX6Gw9ojm_qhxaewea50_e8008Lk,49971
+bmcgo/tasks/task_build_conan.py,sha256=euVymOxVKwCv4FJMAh_dPU-Ii0WujWIXdg_I5l8Cj-A,49970
 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.7.dist-info/METADATA,sha256=yseh5MfSjqLah79NzBBPaBXuJrseP6e6H62K1XH4oCA,1009
-openubmc_bingo-0.6.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.7.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.7.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.7.dist-info/RECORD,,
+openubmc_bingo-0.6.11.dist-info/METADATA,sha256=GwLK6z6A84kM7Yl82K0fVA31QClRhg6EIKLJGuYubhI,1010
+openubmc_bingo-0.6.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.11.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.11.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.11.dist-info/RECORD,,