openubmc-bingo 0.6.27__py3-none-any.whl → 0.6.33__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.33'

bmcgo/cli/cli.py

@@ -243,7 +243,10 @@ class Command(object):
         """HIDDEN: entry point for executing commands, dispatcher to class
         methods
         """
-        if not self._check_conan():
+        force_conan2 = False
+        if "--conan2" in args[0]:
+            force_conan2 = True
+        if not self._check_conan(force_conan2):
             return 1
         self._check_conan_profile()
 
@@ -353,10 +356,10 @@ class Command(object):
                 tools.run_command(f"cp {src_file} {dst_file}")
             tools.run_command(f"sed -i 's/208\\.[0-9]\\+\\.[0-9]\\+/{rtos_version}/g' {dst_file}", command_echo=False)
 
-    def _check_conan(self):
-        need_conan_v2 = False
+    def _check_conan(self, force_conan2):
+        need_conan_v2 = force_conan2
         conf = None
-        if self.bconfig.component:
+        if self.bconfig.component and not force_conan2:
             conanfile = os.path.join(self.bconfig.component.folder, "conanfile.py")
             conf = self.bconfig.component.config
             if not os.path.isfile(conanfile):
@@ -371,10 +374,16 @@ class Command(object):
                 if not match:
                     continue
                 import semver
+                # 临时兼容性措施，强制使用conan1构建
+                # 背景：开源组件初期未获取平台conan2.0支持，只能构建出conan1的包，但为了上库conan2.0的构建脚本
+                #      需要提供一个标记用于临时指示强制使用conan1构建
+                #      待平台版本正式上线后，删除1.60.0判断
+                if semver.satisfies("1.60.0", match[1]):
+                    break
                 if semver.satisfies("2.13.0", match[1]):
                     need_conan_v2 = True
                     break
-        else:
+        elif not force_conan2:
             if self.bconfig.ibmc_sdk:
                 conf = self.bconfig.ibmc_sdk.config
             elif self.bconfig.manifest:

bmcgo/component/build.py

@@ -261,7 +261,9 @@ class BuildComp():
 
     def run_conan_v2(self):
         self.check_conan_profile()
-        from_source = f"--build={self.info.name}/*"
+        from_source = ""
+        if not self.info.without_build:
+            from_source = f"--build={self.info.name}/*"
         if self.info.from_source:
             from_source = "--build=*"
         else:

bmcgo/component/package_info.py

@@ -67,6 +67,9 @@ class InfoComp():
         parser.add_argument(
             "-r", "--remote", help=f"conan仓别名，请检查conan remote list查看已配置的conan仓"
         )
+        parser.add_argument(
+            "--conan2", help=f"强制使用conan2构建组件，此参数仅用于临时兼容组件conan1和conan2构建场景", action=misc.STORE_TRUE
+        )
         parser.add_argument(
             "-s",
             "--from_source",
@@ -99,6 +102,7 @@ class InfoComp():
             action=misc.STORE_TRUE,
         )
         parser.add_argument("-maint", "--maintain", help=argparse.SUPPRESS, action=misc.STORE_TRUE)
+        parser.add_argument("-wb", "--without_build", help="不强制源码构建组件自身", action=misc.STORE_TRUE)
         parser.add_argument(
             "-pr",
             "--profile",
@@ -176,6 +180,7 @@ class InfoComp():
         self.no_cache = self.args.no_cache and (not os.getenv('NOT_CLEAN_CONAN_CACHE') == 'True')
         # 是否是维护模式
         self.is_maintain = self.args.maintain
+        self.without_build = self.args.without_build
         self.enable_luajit = self.args.enable_luajit
         self.profile = Tools.get_conan_profile(self.args.profile, self.build_type, self.enable_luajit, self.test)
         if self.profile == "profile.luajit.ini":

bmcgo/component/template_v2/conanbase.py.mako

@@ -116,7 +116,7 @@ class ConanBase(ConanFile):
             update_conandata(self, {"sources": {self.version: {"branch": None, "url": None, "pwd": os.getcwd(), "timestamp": int(time.time())}}})
             return
         try:
-            tag = git.run(f"tag --points-at HEAD | grep {self.version}")
+            tag = git.run(f"tag --points-at HEAD | grep -m 1 {self.version}")
         except:
             tag = ""
         update_conandata(self, {"sources": {self.version: {"branch": f"refs/tags/{tag}" if tag else commit, "url": url}}})
@@ -273,6 +273,8 @@ class ConanBase(ConanFile):
                     libs.append(libname)
 
         if dirs:
+            dirs.sort()
+            libs.sort()
             self.cpp_info.components["${pkg.name}"].set_property("cmake_target_name", "${pkg.name}::${pkg.name}")
             self.cpp_info.components["${pkg.name}"].set_property("cmake_target_aliass", ["${pkg.name}::${pkg.name}"])
             self.cpp_info.components["${pkg.name}"].set_property("pkg_config_name", "${pkg.name}")

bmcgo/component/test.py

@@ -133,7 +133,6 @@ class TestComp():
         parser.add_argument("-cnt", "--fuzz_count", help="Fuzz count", required=False, type=int, default=100000)
         parser.add_argument("-f", "--test_filter", help="Run unit test with a filter", required=False, default='.')
         parser.add_argument("-a", "--app", help="App in hica", required=False, default='all')
-        parser.add_argument("-wb", "--without_build", help="测试时不重新构建", action=misc.STORE_TRUE)
         parser.add_argument("--coverage_exclude", help="Specify coverage exclude file path of whitelist", 
                             required=False, default="")
         return parser

bmcgo/tasks/task_build_conan.py

@@ -714,17 +714,22 @@ 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)
 
     def install_openubmc_v2(self):
+        channel_cmd = " --user=openubmc --channel=stable"
         profile_file = os.path.join(self.tools.conan_profiles_dir, self.config.profile)
         if not os.path.isfile(profile_file):
             raise BmcGoException(f"{profile_file} 文件不存在")
@@ -737,6 +742,7 @@ class TaskClass(Task):
         lock_cmd = f"conan lock create . {base_cmd} --lockfile-out={self.lockfile}"
         self.run_command(lock_cmd, capture_output=False)
         graph_cmd = f"conan graph info . {base_cmd} -f json --lockfile={self.lockfile} --out-file={self.graphfile}"
+        graph_cmd += channel_cmd
         self.run_command(graph_cmd)
         self.success(f"start build dependency packages of {self.config.board_name}")
         if self.skip_install_comp:
@@ -749,7 +755,7 @@ class TaskClass(Task):
             bcp = BuildConans(self.graphfile, self.lockfile, base_cmd, self.config.from_source, self.config.log_path)
             bcp.build()
             self.clean_folder_not_exist_packages()
-        cmd = f"conan create . {base_cmd} --build=missing"
+        cmd = f"conan create . {base_cmd} {channel_cmd} --build=missing"
         self.info(f"start build {self.config.board_name}: {cmd}")
         self.run_command(cmd)
 
@@ -869,6 +875,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 +1126,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进行打桩

bmcgo/utils/tools.py

@@ -438,10 +438,10 @@ class Tools():
         rtos_version = platform_package.get("options", {}).get(
             "rtos_version", "rtos_v2"
         )
-        enable_haf = platform_package.get("options", {}).get("enable_haf", False)
+        enable_haf = platform_package.get("options", {}).get("enable_haf", True)
         append_cmd = f"-o {option_key}:rtos_version={rtos_version}"
+        append_cmd += f" -o {option_key}:enable_haf={enable_haf}"
         append_cmd += f" -r {remote}" if remote else ""
-        append_cmd += f" -o {option_key}:enable_haf=True" if enable_haf else ""
         if update_conan_cache:
             append_cmd += " -u"
         append_cmd += " --build=missing"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.27
+Version: 0.6.33
 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.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=oqZ8oOARtejTeAecTilQ7hon25T3svORSMnhnL6HQwY,562
+bmcgo/__init__.py,sha256=MSbDCURCHz9rQhhc2TNjfE-JFDxFzBia9RWAceY8b0Y,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=pgkIjjo3owY3tNbujIUGxJshanVElrwJ0gsXj8X3BXI,27181
+bmcgo/cli/cli.py,sha256=kd1Bncj5eI77YDmptd4oENzGcXyqfszi0YLqvheGCWo,27808
 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=HWjgY1L1AXL7ndA35PKMFfweGSd8xXTRjY-ULW9ngGw,12851
+bmcgo/component/build.py,sha256=zEtX3IG43z-EC8frpuRRH8zx2KjVuA1LlLnhDgErhqE,12920
 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=kNfqBSiBoZDQoyFjymIEJt9ohXi3_2rELsvyxCzpLNk,45371
+bmcgo/component/package_info.py,sha256=pEeRDfIeHYBt0SAqN_Arpv3d-S1XVB7Mn5Z0MNSRloU,14837
+bmcgo/component/test.py,sha256=Kpg5fmcJ-F2lDlHsKTBXjhB00T-IOr5QWGfHsRXVgA0,45260
 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=fz2i1A4LecWfsvKno7ru_jRAVqR7G8dyj54SgQPKAv4,15676
+bmcgo/component/template_v2/conanbase.py.mako,sha256=TxqfYjhwKKjSARDJAIodSOWRhvUvsbOlw8nOjdO5QRo,15729
 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=w8tdU5NwoUfVF4xKFvSzcCWCf0FGTBHJAToNLlP0p4w,18424
-bmcgo/tasks/task_build_conan.py,sha256=EpxDBOSmj9YIDSF8ifG0lREIAhOfQbWjt29lmO6mI1g,52546
+bmcgo/tasks/task_build_conan.py,sha256=HNjEOuUN0uXN_myrhPP6d6BbxQqGnSVl9ZiJoZVdqA0,53024
 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
@@ -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=dB7lX0jv-mE6pBalzm-VUZEnxPSbYkgC9soD_FAAnFg,32587
+bmcgo/utils/tools.py,sha256=Ad6TwJ2iEx3isWlGdlZzsZAKjVrBOj_dnbPmeJfICHY,32572
 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.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.33.dist-info/METADATA,sha256=KnHh344kR5Wqxi49MJEY9C92awC_X6JS6kWLx8wYpL4,1010
+openubmc_bingo-0.6.33.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.33.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.33.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.33.dist-info/RECORD,,