openubmc-bingo 0.5.275__py3-none-any.whl → 0.6.0__py3-none-any.whl

bmcgo/functional/maintain.py

@@ -26,6 +26,7 @@ from bmcgo.component.build import BuildComp
 from bmcgo import errors
 from bmcgo.bmcgo_config import BmcgoConfig
 from bmcgo import misc
+from bmcgo import errors
 
 tool = Tools("maintain")
 log = tool.log
@@ -89,22 +90,33 @@ class BmcgoCommand:
     def __init__(self, bconfig: BmcgoConfig, *args):
         self.patch_file = []
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog="bmcgo maintain", description="BMC组件的维护管理工具", add_help=True,
-                                         formatter_class=argparse.RawTextHelpFormatter)
-        parser.add_argument("-cp", "--conan_package", help="指定需要维护的组件版本，示例：component/1.2.3", required=True)
+        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} maintain", description="BMC组件的维护管理工具",
+                                         add_help=True, formatter_class=argparse.RawTextHelpFormatter)
+        if misc.conan_v1():
+            parser.add_argument("-cp", "--conan_package", help="指定需要维护的组件版本，示例：component/1.2.3", required=True)
+        else:
+            parser.add_argument("-cp", "--conan_package",
+                                help="指定需要维护的组件版本，示例：component/1.2.3@{misc.conan_user()}/stable", required=True)
         parser.add_argument("-p", "--patch_file", help="添加patch文件，可指定多个，顺序追加到代码中", action='append')
         parser.add_argument("-b", "--branch", help="用于提取patch的分支，与commit_id配合使用", default="master")
         parser.add_argument("-c", "--commit_id", help="需要生成patch的提交节点，长度不低于8个字符，可指定多个，顺序追加到代码中",
                             action='append')
         parser.add_argument("-v", "--version", help="指定需要生成的组件版本号", default=None)
-        parser.add_argument("-r", "--remote", default=misc.CONAN_REPO,
+        parser.add_argument("-r", "--remote", default=misc.conan_remote(),
                             help="conan远程仓，请检查conan remote list查看已配置的conan仓")
         parsed_args = parser.parse_args(*args)
         cp = parsed_args.conan_package
-        if (not re.match("^[a-zA-Z0-9_-]+/([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+$", cp) and
-           not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)$", cp) and
-           not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(.p[0-9]+)$" + cp)):
-            raise errors.BmcGoException("-cp参数错误，不满足格式\"<name>/<version>\"要求")
+        if misc.conan_v1():
+            if (not re.match("^[a-zA-Z0-9_-]+/([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+$", cp) and
+            not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)$", cp) and
+            not re.match("^[a-zA-Z0-9_-]+/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(.p[0-9]+)$" + cp)):
+                raise errors.BmcGoException("-cp参数错误，不满足格式\"<name>/<version>\"要求")
+        else:
+            restr = misc.CONAN_NAME_RESTR
+            if (not re.match(f"^{restr}/([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+@{restr}/{restr}$", cp) and
+            not re.match(f"^{restr}/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(-build\.[0-9]+)@{restr}/{restr}$", cp) and
+            not re.match(f"^{restr}/(([1-9][0-9]*|[0-9])\.[0-9]+\.[0-9]+)(.p[0-9]+)@{restr}/{restr}$" + cp)):
+                raise errors.BmcGoException("-cp参数错误，不满足格式\"<name>/<version>@user/channel\"要求")
         self.conan_package = cp
         self.name = self.conan_package.split("/")[0]
         self.base_version = self.conan_package.split("/")[1]
@@ -127,7 +139,7 @@ class BmcgoCommand:
             if re.match(r"^[a-f0-9]{8,40}$", commit) is None:
                 raise errors.ConfigException(f"参数错误, --commit_id({commit}) 格式错误")
         self.patch_description = ""
-        self.dir = tempfile.TemporaryDirectory(prefix="bmcgo_maint")
+        self.dir = tempfile.TemporaryDirectory(prefix="bingo_maint")
         for file in self.patch_file:
             if not os.path.isfile(file):
                 raise errors.BmcGoException(f"补丁文件 {file} 不存在")
@@ -182,11 +194,36 @@ class BmcgoCommand:
         log.success(f"生成维护版本 {self.name}/{self.next_version} 成功")
         return 0
 
-    def _fetch_conan_info(self):
-        user = tool.conan_user
+    def _fetch_conan_info_v2(self):
+        args = "--only-recipe" if misc.conan_v2() else "--recipe"
+        cmd = f"conan download {self.conan_package} -r {self.remote} {args}"
+        tool.run_command(cmd, error_log=f"组件 {self.conan_package} 未找到，请检查网络连接以及该版本是否已发布")
+        cmd = f"conan cache path {self.conan_package}"
+        export_path = tool.run_command(cmd, capture_output=True, shell=True).stdout.strip()
+        conanfile = os.path.join(export_path, "conanfile.py")
+        conandata = os.path.join(export_path, "conandata.yml")
+        if not os.path.isfile(conandata):
+            raise errors.BmcGoException(f"未找到组件 {self.conan_package} 的conandata.yml文件")
+        log.info(f"从 {conandata} 读取源码tag的url")
+        # 尝试从conandata中获取代码仓地址
+        with open(conandata, "r") as fp:
+            data = yaml.safe_load(fp)
+        cfg = data.get("sources", {}).get(self.base_version)
+        if cfg is None:
+            raise RuntimeError(f"${conandata}不存在组件 {self.conan_package} 配置, 请检查是否正确")
+        self.url = cfg.get("url")
+        self.tag = cfg.get("branch")
+        if re.match("^refs/tags/[0-9]+\\.[0-9]+\\.[0-9]+$", self.tag):
+            self.tag = self.tag[len("refs/tags/"):]
+        elif not self.tag:
+            self.tag = self.base_version
+
+    def _fetch_conan_info_v1(self):
+        user = misc.conan_user()
+        args = "--only-recipe" if misc.conan_v2() else "--recipe"
         export_path = os.path.join(tool.conan_data, self.conan_package, f"{user}/stable", "export")
         if not os.path.isdir(export_path):
-            cmd = f"conan download {self.conan_package}@{user}/stable -r {self.remote} -re"
+            cmd = f"conan download {self.conan_package}@{user}/stable -r {self.remote} {args}"
             tool.run_command(cmd, error_log=f"组件 {self.conan_package} 未找到，请检查网络连接以及该版本是否已发布")
         conanfile = os.path.join(export_path, "conanfile.py")
         conandata = os.path.join(export_path, "conandata.yml")
@@ -216,6 +253,12 @@ class BmcgoCommand:
             else:
                 raise RuntimeError("无法找到版本(revision)和地址(url)字段")
 
+    def _fetch_conan_info(self):
+        if misc.conan_v1():
+            self._fetch_conan_info_v1()
+        else:
+            self._fetch_conan_info_v2()
+
     def _update_next_version(self):
         self.next_version = self.arg_special_version
         if not self.next_version:

bmcgo/functional/new.py

@@ -54,7 +54,7 @@ _TEMPLATES = {
 class BmcgoCommand:
     def __init__(self, bconfig: BmcgoConfig, *args):
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog="bingo new", description="创建组件", add_help=True,
+        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} new", description="创建组件", add_help=True,
                                          formatter_class=argparse.RawTextHelpFormatter)
         for item in _REQUIRES:
             parser.add_argument(f"-{item[0]}", f"--{item[1]}", help=f"指定{item[2]}", required=True)

bmcgo/functional/schema_valid.py

@@ -43,8 +43,8 @@ class BmcgoCommand:
             bconfig (BmcgoConfig): bmcgo 配置
         """
         self.bconfig = bconfig
-        parser = argparse.ArgumentParser(prog="bingo validate_yml", description="Validate yaml files", add_help=True,
-                                         formatter_class=argparse.RawTextHelpFormatter)
+        parser = argparse.ArgumentParser(prog=f"{misc.tool_name()} validate_yml", description="Validate yaml files",
+                                         add_help=True, formatter_class=argparse.RawTextHelpFormatter)
         parser.add_argument("-t", "--target", help="目标文件夹或单个yaml文件，默认当前目录", default=".")
 
         parsed_args = parser.parse_args(*args)

bmcgo/logger.py

@@ -61,7 +61,7 @@ class CustomFormatter(logging.Formatter):
 
 
 class Logger(logging.Logger):
-    def __init__(self, name="bmcgo", level=logging.INFO, log_file=None):
+    def __init__(self, name="bingo", level=logging.INFO, log_file=None):
         """初始化一个日志记录器
 
         Args:
@@ -79,7 +79,7 @@ class Logger(logging.Logger):
             ch = logging.FileHandler(filename=log_file)
             ch.setFormatter(formatter)
             self.addHandler(ch)
-        self.is_debug = True
+        self.is_debug = True if self.log_level_env else False
         if self.log_level_env == "info":
             self.setLevel(logging.INFO)
         elif self.log_level_env == "warn":
@@ -89,7 +89,6 @@ class Logger(logging.Logger):
         elif self.log_level_env == "debug":
             self.setLevel(logging.DEBUG)
         else:
-            self.is_debug = False
             self.setLevel(level)
         ch = logging.StreamHandler()
         ch.setFormatter(formatter)

bmcgo/misc.py

@@ -11,11 +11,10 @@
 # See the Mulan PSL v2 for more details.
 import re
 import os
+import sys
 from enum import Enum
-from bmcgo import errors
-from bmcgo.logger import Logger
+from conan import conan_version
 
-log = Logger("work_prepare")
 
 CACHE_DIR = f"{os.path.expanduser('~')}/.bmcgo_log"
 CONAN_REPO = "openubmc_dev"
@@ -23,7 +22,7 @@ CONAN_USER = 'openUBMC'
 
 STORE_TRUE = "store_true"
 STORE_FALSE = "store_false"
-SCHEMA_FILE_PATH = "/usr/share/bmcgo/schema"
+SCHEMA_FILE_PATH = "/usr/share/bingo/schema"
 GLOBAL_CFG_FILE = "/etc/bmcgo.conf"
 CONAN = "conan"
 # bmcgo.conf中用于定义路径的选项名
@@ -103,6 +102,12 @@ HPM_ENCRYPT = "hpm_encrypt"
 HPM_ENCRYPT_ENABLE = "enable"
 HPM_ENCRYPT_TOOL = "crypto_tool"
 
+# CONAN包每一段的正则表达式
+CONAN_NAME_RESTR = "[a-z0-9_][a-z0-9_+.-]{1,100}"
+
+# 工具名称
+BINGO_NAME = "bingo"
+
 
 class StageEnum(Enum):
     STAGE_DEV = "dev"
@@ -111,9 +116,31 @@ class StageEnum(Enum):
     STAGE_STABLE = "stable"
 
 
-class ConanUserEnum(Enum):
-    CONAN_USER_RELEASE = f'{CONAN_USER}.release'
-    CONAN_USER_DEV = f'{CONAN_USER}.dev'
+class BuildTypeEnum(Enum):
+    DEBUG = "debug"
+    RELEASE = "release"
+
+
+def conan_v1():
+    return conan_version.major == 1
+
+
+def conan_v2():
+    return conan_version.major == 2
+
+
+def build_type():
+    bt = ["debug", "release"]
+    if conan_v1():
+        bt.append("dt")
+    return bt
+
+
+def build_type_str():
+    bt = "debug, release"
+    if conan_v1():
+        bt += ", dt"
+    return bt
 
 
 class CommandInfo():
@@ -140,11 +167,105 @@ def get_decleared_schema_file(file) -> str:
         if match is None:
             continue
         schema_file = match.group(1).strip()
-        log.debug("读取行: " + line)
         if os.path.isfile(schema_file):
             return str(schema_file)
+        if "/bmcgo/" in schema_file and tool_name() == "bingo":
+            bing_schema = schema_file.replace("/bmcgo/", "/bingo/")
+            if os.path.isfile(bing_schema):
+                return str(bing_schema)
         schema_file = os.path.join(os.path.dirname(file), schema_file)
         schema_file = os.path.realpath(schema_file)
         if os.path.isfile(schema_file):
             return str(schema_file)
-    return ""
+    return ""
+
+
+def tool_name() -> str:
+    return os.path.basename(sys.argv[0])
+
+
+def community_name() -> str:
+    """
+    返回社区名称，默认为openubmc，可以通过环境变量修改
+    """
+    return os.environ.get("OPENUBMC_COMMUNITY_NAME", "openubmc")
+
+
+def conan_user() -> str:
+    """
+    返回正式conan包的user字段
+    """
+    if conan_v1():
+        return os.environ.get("OPENUBMC_DEFAULT_CONAN_USER", "openUBMC.release")
+    else:
+        return os.environ.get("OPENUBMC_DEFAULT_CONAN_USER", "openubmc")
+
+
+def conan_user_dev() -> str:
+    """
+    返回调试conan包的user字段
+    """
+    if conan_v1():
+        return os.environ.get("OPENUBMC_DEFAULT_CONAN_USER", "openUBMC.release")
+    else:
+        return os.environ.get("OPENUBMC_DEFAULT_CONAN_USER_DEV", "openubmc.dev")
+
+
+def conan_remote() -> str:
+    """
+    返回默认远程仓名
+    """
+    return os.environ.get("OPENUBMC_DEFAULT_CONAN_REMOTE", "openubmc_dev")
+
+
+def boardname_default() -> str:
+    """
+    返回默认单板名
+    """
+    return os.environ.get("OPENUBMC_DEFAULT_BOARD_NAME", "openUBMC")
+
+
+def logo() -> str:
+    """
+    返回LOGO
+    """
+    return os.environ.get("OPENUBMC_DEFAULT_LOGO", "openUBMC")
+
+
+def boardname_default() -> str:
+    """
+    返回默认单板名
+    """
+    return os.environ.get("OPENUBMC_DEFAULT_BOARD_NAME", "openUBMC")
+
+
+def schema_path() -> str:
+    return os.environ.get("OPENUBMC_SCHEMA_PATH", "/usr/share/bingo/schema")
+
+
+def vendor() -> str:
+    """
+    默认厂商名，用于制作HPM包时使用，生效时的优先级：
+    1. 优先manifest/base/vendor配置
+    2. 再次OPENUBMC_DEFAULT_VENDOR环境变量
+    3. 最后使用社区名
+    """
+    return os.environ.get("OPENUBMC_DEFAULT_VENDOR", "openUBMC")
+
+
+def need_encrypt_hpm() -> str:
+    """
+    是否需要加密固件
+    """
+    return os.environ.get("OPENUBMC_ENCRYPTO_HPM_PACKAGE", False)
+
+
+def conan_package_match(name: str, valid_range=True) -> bool:
+    restr = CONAN_NAME_RESTR
+    if re.match(f"^{restr}/{restr}@{restr}/{restr}$", name):
+        return True
+    if valid_range:
+        match = re.search('\\[.*\\]', name)
+        if match:
+            return True
+    return False

bmcgo/tasks/conan/__init__.py

@@ -0,0 +1,10 @@
+# coding: utf-8
+# Copyright (c) 2024 Huawei Technologies Co., Ltd.
+# openUBMC is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#         http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.

bmcgo/tasks/conan/conanfile.py

@@ -0,0 +1,45 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2024 Huawei Technologies Co., Ltd.
+# openUBMC is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#         http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+from conan import ConanFile
+import yaml
+
+
+class OpenubmcConan(ConanFile):
+    name = "openubmc"
+    url = "https://www.huawei.com"
+    settings = "os", "compiler", "build_type", "arch"
+    requires = []
+    license = "Mulan PSL v2"
+    exports_sources = ["manifest.yml"]
+    _manifest = None
+
+    def init(self):
+        with open("manifest.yml", "r") as fp:
+            self._manifest = yaml.safe_load(fp)
+
+    def set_version(self):
+        self.version = self._manifest["base"]["version"].lower()
+
+    def requirements(self):
+        for dep in self._manifest.get("dependencies", {}):
+            require = dep["conan"] + ""
+            self.requires(require)
+
+    def build(self):
+        pass
+
+    def package(self):
+        pass
+
+    def package_info(self):
+        pass
+

bmcgo/tasks/task.py

@@ -20,13 +20,13 @@ import tempfile
 import filecmp
 from string import Template
 from multiprocessing import Process
-from collections import OrderedDict
 
 import yaml
-from conans.model.profile import Profile
 from bmcgo.utils.config import Config
 from bmcgo.utils.tools import Tools
 from bmcgo import errors
+from bmcgo import misc
+from bmcgo.component.deploy import GraphNode
 from bmcgo.utils.component_post import ComponentPost
 from bmcgo.functional.simple_sign import BmcgoCommand as SimpleSign
 
@@ -40,12 +40,21 @@ class Task(Process):
 
     def __init__(self, config: Config, work_name=""):
         super(Task, self).__init__()
+        self.community_name = misc.community_name()
         log_file = os.path.join(config.temp_path, "log", "task.log")
         self.tools: Tools = Tools(work_name, log_file=log_file)
         self.log = self.tools.log
         self.config: Config = config
         self.built_type_check()
         self.work_name = work_name
+        # 记录每个组件的GraphNode信息
+        self.graph_nodes: dict[str, GraphNode] = {}
+        # 设置默认的厂商名，产品可以manifest.yml的base/vendor中设置
+        # manifest未配置vendor时，使用OPENUBMC_DEFAULT_VENDOR环境变量
+        # OPENUBMC_DEFAULT_VENDOR环境变量未设置时，使用openubmc
+        self.vendor = self.get_manufacture_config("base/vendor", misc.vendor())
+        os.environ["OPENUBMC_PRODUCT_VENDOR"] = self.vendor
+        self.customization_dir = os.path.join(self.config.build_path, "customizations")
 
     @property
     def conan_home(self):
@@ -210,7 +219,7 @@ class Task(Process):
         """
         return self.config.get_manufacture_config(key, default_val)
 
-    def get_profile_config(self) -> (Profile, OrderedDict):
+    def get_profile_config(self):
         return self.tools.get_profile_config(self.config.profile)
 
     def prepare_conan(self):
@@ -320,7 +329,15 @@ class Task(Process):
                 raise OSError(f"未知条件: {key}, 请检查此种条件是否在配置内")
         return True
 
-    def _component_cust_action(self, action: str):
+    def _component_cust_action_v2(self, action: str):
+        profile, _ = self.get_profile_config()
+        for name in os.listdir(self.customization_dir):
+            path_dir = os.path.join(self.customization_dir, name)
+            self.info(f"开始执行组件 {name} 定制化 {action}，定制脚本 {path_dir}/include/customization.py")
+            post = ComponentPost(self.config, path_dir, profile)
+            post.post_work(os.getcwd(), action)
+
+    def _component_cust_action_v1(self, action: str):
         conan_install = f"{self.config.build_path}/conan_install"
 
         # 优先处理rootfs定制化脚本
@@ -344,6 +361,12 @@ class Task(Process):
             post = ComponentPost(self.config, os.path.join(conan_install, comp), profile)
             post.post_work(os.getcwd(), action)
 
+    def _component_cust_action(self, action: str):
+        if misc.conan_v2():
+            return self._component_cust_action_v2(action)
+        else:
+            return self._component_cust_action_v1(action)
+
     def _local_signature(self, unsigned_file, cms_output, crl_output, ca_output):
         """自签名方法"""
         self_sign_config = self.config.bconfig.hpm_self_sign