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

bmcgo/cli/cli.py

@@ -20,6 +20,7 @@ import stat
 import json
 import re
 import traceback
+from tempfile import NamedTemporaryFile
 from importlib.util import spec_from_file_location, module_from_spec
 
 import yaml
@@ -244,7 +245,8 @@ class Command(object):
         """
         if not self._check_conan():
             return 1
-        self._check_conan_profile
+        self._check_conan_profile()
+
         try:
             command = args[0][0]
         except IndexError:  # No parameters
@@ -313,13 +315,34 @@ class Command(object):
 
     def _check_conan_profile(self):
         profile_dir = os.path.join(tools.conan_home, "profiles")
-        if os.path.isdir(profile_dir):
-            return
+        if not os.path.isdir(profile_dir):
+            os.makedirs(profile_dir)
 
         if misc.conan_v2():
-            log.info("检测到依赖conan2.0但未正确初始化，需要切换到产品仓执行一次构建，以安装和配置工具链")
+            bingo_profiles = "/usr/share/bingo/profiles_for_conan2"
         else:
-            log.info("检测到依赖conan1.0但未正确初始化，需要切换到产品仓执行一次构建，以安装和配置工具链")
+            bingo_profiles = "/usr/share/bingo/profiles_for_conan1"
+        if not os.path.isdir("/opt/RTOS"):
+            log.info(f"未检测到/opt/RTOS目录，可能未安装构建工具，请正确安装构建工具（可以manifest仓执行init.py或{misc.tool_name()} build）")
+            return
+        rtos_version = ""
+        for ver in os.listdir("/opt/RTOS"):
+            if re.match("^208\\.[0-9]+\\.[0-9]+$", ver):
+                if rtos_version:
+                    log.warning(f"/opt/RTOS安装了多个RTOS工具版本，版本不匹配将导致编译失败，建议只保留其中一个，本次将使用{rtos_version}构建。")
+                    break
+                rtos_version = ver
+        if not rtos_version:
+            log.info(f"未检测到/opt/RTOS目录下的构建工具，可能未安装构建工具，请正确安装构建工具（可以manifest仓执行init.py或{misc.tool_name()} build）")
+            return
+        for file in os.listdir(bingo_profiles):
+            os.makedirs(profile_dir, exist_ok=True)
+            src_file = os.path.join(bingo_profiles, file)
+            dst_file = os.path.join(profile_dir, file)
+            if not os.path.isfile(dst_file):
+                log.info(f"复制 {src_file} 到 {dst_file}")
+                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

bmcgo/codegen/lua/codegen.py

@@ -51,7 +51,7 @@ class CodeGen(object):
             return lua_format
 
     def get_mdb_interface_package(self):
-        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_STABLE.value}"
         package = f"mdb_interface/[>=0.0.1]{channel}"
         dependencies = self.read_service_json().get(misc.CONAN_DEPDENCIES_KEY)
         if not dependencies:
@@ -110,7 +110,7 @@ class CodeGen(object):
         mdb_interface_tmp_dir = os.path.join(conan_home, "latest_mdb_interface")
         env = dict(os.environ, CONAN_STORAGE_PATH=mdb_interface_tmp_dir)
 
-        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_STABLE.value}"
         package = f"mdb_interface/[>=0.0.1]{channel}"
         
         cmd = ["conan", "install", package, f"-if={temp_dir}", "--update", "--build=missing", "-g", "deploy"]
@@ -121,6 +121,45 @@ class CodeGen(object):
         subprocess.run(cmd, env=env)
         shutil.copytree(os.path.join(temp_dir, "mdb_interface/opt/bmc/apps/mdb_interface"), target_dir)
         shutil.rmtree(temp_dir, ignore_errors=True)
+    
+    def setup_mdb_interfacev2(self):
+        target_dir = os.path.join(self.project_dir, 'temp/opt/bmc/apps/mdb_interface')
+        shutil.rmtree(target_dir, ignore_errors=True)
+        temp_dir = os.path.join(self.project_dir, 'temp/.mdb_interface_temp')
+        shutil.rmtree(temp_dir, ignore_errors=True)
+        os.makedirs(temp_dir, exist_ok=True)
+        if self.get_mdb_interface_url(temp_dir, target_dir):
+            shutil.rmtree(temp_dir, ignore_errors=True)
+            return
+        package = self.get_mdb_interface_package()
+        cmd = ["conan", "install", f"--requires={package}", f"-of={temp_dir}", "--build=missing", "-d", "direct_deploy",
+               f"--deployer-folder={temp_dir}"]
+        cmd += ["-pr=profile.dt.ini"]
+        if self.remote:
+            cmd += ["-r", self.remote]
+        subprocess.call(cmd)
+        shutil.copytree(os.path.join(temp_dir, "direct_deploy/mdb_interface/opt/bmc/apps/mdb_interface"), target_dir)
+        shutil.rmtree(temp_dir, ignore_errors=True)
+
+    def setup_latest_mdb_interfacev2(self):
+        target_dir = os.path.join(self.project_dir, 'temp/opt/bmc/apps/latest_mdb_interface')
+        shutil.rmtree(target_dir, ignore_errors=True)
+        temp_dir = os.path.join(self.project_dir, 'temp/.latest_mdb_interface_temp')
+        shutil.rmtree(temp_dir, ignore_errors=True)
+        os.makedirs(temp_dir, exist_ok=True)
+
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_STABLE.value}"
+        package = f"mdb_interface/[>=0.0.1]{channel}"
+        
+        cmd = ["conan", "install", f"--requires={package}", f"-of={temp_dir}", "--build=missing", "-d", "direct_deploy",
+               "--update", f"--deployer-folder={temp_dir}"]
+        cmd += ["-pr=profile.dt.ini"]
+        if self.remote:
+            cmd += ["-r", self.remote]
+
+        subprocess.run(cmd)
+        shutil.copytree(os.path.join(temp_dir, "direct_deploy/mdb_interface/opt/bmc/apps/mdb_interface"), target_dir)
+        shutil.rmtree(temp_dir, ignore_errors=True)
 
     def is_valid_date(self, date_str):
         pattern = r'^-- Create: \d{4}-\d{1,2}-\d{1,2}$'
@@ -164,8 +203,12 @@ class CodeGen(object):
     def generate_code_run(self, args):
         shutil.rmtree(self.gen_tool_dir, ignore_errors=True)
         shutil.copytree(cwd, self.gen_tool_dir)
-        self.setup_mdb_interface()
-        self.setup_latest_mdb_interface()
+        if misc.conan_v2():
+            self.setup_mdb_interfacev2()
+            self.setup_latest_mdb_interfacev2()
+        else:
+            self.setup_mdb_interface()
+            self.setup_latest_mdb_interface()
         lua_format = self.get_lua_format()
         cmd = [
             "/usr/bin/make", "-j12", f"PROJECT_NAME={self.project_name}", f"TPL_DIR={self.gen_tool_dir}",

bmcgo/component/template_v2/conanbase.py.mako

@@ -115,7 +115,10 @@ class ConanBase(ConanFile):
         if not url:
             update_conandata(self, {"sources": {self.version: {"branch": None, "url": None, "pwd": os.getcwd(), "timestamp": int(time.time())}}})
             return
-        tag = git.run("tag --points-at HEAD")
+        try:
+            tag = git.run(f"tag --points-at HEAD | grep {self.version}")
+        except:
+            tag = ""
         update_conandata(self, {"sources": {self.version: {"branch": f"refs/tags/{tag}" if tag else commit, "url": url}}})
         % endif
 

bmcgo/utils/build_conans.py

@@ -94,28 +94,34 @@ class BuildConans(object):
         if self.force_build:
             cmd += f" --build=\"{node.name}/*\""
         try:
-            logfile = f"{self.log_dir}/conan_build_{node.name}.log"
-            log.debug(f">>>> {cmd}")
-            log.info(f">>>> build {node.ref} start, logfile: {logfile}")
-            with os.fdopen(os.open(logfile, os.O_RDWR | os.O_CREAT, stat.S_IWUSR | stat.S_IRUSR), "a+") as f:
-                real_cmd = shlex.split(cmd)
-                pipe = subprocess.Popen(real_cmd, stdout=f, stderr=f)
-                start_time = time.time()
-                while True:
-                    if pipe.poll() is not None:
-                        break
-                    # 1800秒超时
-                    if time.time() - start_time > 1800:
-                        pipe.kill()
-                        raise errors.BmcGoException(f"================== {node.name} 构建超时 ==================")
-                    time.sleep(1)
-                if pipe.returncode != 0:
-                    log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
-                    f.seek(0)
-                    conan_log = f.read()
-                    log.error(conan_log)
-                    log.error(f"================== {node.name} 构建失败日志结束位置 ==================")
-                    raise errors.BmcGoException(f"================== {node.name} 构建失败 ==================")
+            for i in range(1, 2):
+                logfile = f"{self.log_dir}/conan_build_{node.name}.log"
+                log.debug(f">>>> {cmd}")
+                log.info(f">>>> build {node.ref} start, logfile: {logfile}")
+                with os.fdopen(os.open(logfile, os.O_RDWR | os.O_CREAT, stat.S_IWUSR | stat.S_IRUSR), "a+") as f:
+                    real_cmd = shlex.split(cmd)
+                    pipe = subprocess.Popen(real_cmd, stdout=f, stderr=f)
+                    start_time = time.time()
+                    while True:
+                        if pipe.poll() is not None:
+                            break
+                        # 1800秒超时
+                        if time.time() - start_time > 1800:
+                            pipe.kill()
+                            raise errors.BmcGoException(f"================== {node.name} 构建超时 ==================")
+                        time.sleep(1)
+                    if pipe.returncode != 0:
+                        # 首次增量构建失败时切换到源码构建模式
+                        if i == 1 and not self.force_build:
+                            cmd += f" --build=\"{node.name}/*\""
+                            continue
+
+                        log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
+                        f.seek(0)
+                        conan_log = f.read()
+                        log.error(conan_log)
+                        log.error(f"================== {node.name} 构建失败日志结束位置 ==================")
+                        raise errors.BmcGoException(f"================== {node.name} 构建失败 ==================")
             log.success(f"<<<< build {node.ref} finished")
         except Exception as e:
             self.exception = e

{openubmc_bingo-0.6.12.dist-info → openubmc_bingo-0.6.17.dist-info}/METADATA

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

{openubmc_bingo-0.6.12.dist-info → openubmc_bingo-0.6.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=LTY5Z2FjhuAVeEjEvpXVTkGmbl-SH_M0HM7-GCKg4wQ,562
+bmcgo/__init__.py,sha256=-ZiFjQB0Op9berOvBtulbZEJLN5Qomt1CPbhMxDRZfA,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=KhencIa6l77zCkf9ssxCG3kmK1O2u0RsK-Ge_AJly-Y,25556
+bmcgo/cli/cli.py,sha256=O1E4QnAF453rj1jnfLkXfXNDPyZ6h6ry8_eoJiW7mXY,26859
 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
@@ -35,7 +35,7 @@ bmcgo/codegen/c/template/server.h.mako,sha256=hZg1U64YKtlUm4wuKRobhjGW8e7rzFu9xg
 bmcgo/codegen/lua/.lua-format,sha256=h6RLqe84SjDqKO1mqoCW7XVtrAwDMTRM1Rj8nwzPGwQ,188
 bmcgo/codegen/lua/Makefile,sha256=wliuAhxhChrpsTnWuOlje3gtW2KRqayIhGRYBkvFi-c,3304
 bmcgo/codegen/lua/__init__.py,sha256=2yU9vzUVQmMJ0qBtNJ-AfKpnOzYZo4wAxlRnpFwgE7M,521
-bmcgo/codegen/lua/codegen.py,sha256=tyIe6JQ6DGDkRuA7i79HZS59ffHuzBHVjuEQ3BVr3oA,9063
+bmcgo/codegen/lua/codegen.py,sha256=Ka2ZCkbhkB9b8QwMSE7tMPI9argikmWmbFm_YrTuRkY,11222
 bmcgo/codegen/lua/proto/Makefile,sha256=rS4nEBwWJEDYAb5XN9S7SfII7RMFb071jh0eh_KJePo,3098
 bmcgo/codegen/lua/proto/ipmi_types.proto,sha256=BX09mymhhPkWqZE1UCVJACpLBeQh1vQN31oBRVVieFY,377
 bmcgo/codegen/lua/proto/types.proto,sha256=_X8JCKZCvO6PfWh6tuWcEqKHROrh46rCZab-OCkfirA,1162
@@ -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=X27JBoMWq_kUaxJpNHLuS9idmDENGmQNTI4nHg0ReJU,15599
+bmcgo/component/template_v2/conanbase.py.mako,sha256=fz2i1A4LecWfsvKno7ru_jRAVqR7G8dyj54SgQPKAv4,15676
 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
@@ -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=ibEPc2vg3A12jcfocwAgsSPAJZ8jDCIlEz8UGXT-cto,9382
+bmcgo/utils/build_conans.py,sha256=lEaZFCTjRc8pLWXWw71n7zl4zwmWg1s561Atn-Y32HA,9748
 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.12.dist-info/METADATA,sha256=MfjerwVFLXM9zv5Irk5CDuZGLzLQFVDgwisNYi4dAIY,1010
-openubmc_bingo-0.6.12.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.12.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.12.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.12.dist-info/RECORD,,
+openubmc_bingo-0.6.17.dist-info/METADATA,sha256=qPEuNbLIleXDMDQrn7OmQrjBGBvdyKM4gd1iJF9yxh0,1010
+openubmc_bingo-0.6.17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.17.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.17.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.17.dist-info/RECORD,,