lbkit 0.8.7__tar.gz → 0.8.8__tar.gz

{lbkit-0.8.7/lbkit.egg-info → lbkit-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.8.7
+Version: 0.8.8
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.8.8/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.8.8'

{lbkit-0.8.7 → lbkit-0.8.8}/lbkit/tasks/config.py

@@ -145,6 +145,36 @@ class Config(object):
             return product_cfg
         return Config.merge_cfg(global_cfg, product_cfg)
 
+    def _trans_dependencies_to_dict(self, deps):
+        out = {}
+        for dep in deps:
+            name = dep["package"]
+            name = name.split("/")[0]
+            out[name] = dep
+        return out
+
+    def _merge_dependencies(self, dst, src: dict[str, dict]):
+        for key, val in src.items():
+            dst[key] = val
+        return dst
+
+    def get_dependencies(self):
+        debug_cfg = self.get_manifest_config("debug_dependencies", [])
+        debug_dict = self._trans_dependencies_to_dict(debug_cfg)
+        global_cfg = self.get_manifest_config("dependencies", [])
+        global_dict = self._trans_dependencies_to_dict(global_cfg)
+        # debug_cfg优先级更高
+        tmp = self._merge_dependencies(global_dict, debug_dict)
+        key = f"products/{self.product}/dependencies"
+        # product_cfg优先级最高
+        product_cfg = self.get_manifest_config(key, [])
+        product_dict = self._trans_dependencies_to_dict(product_cfg)
+        tmp = self._merge_dependencies(tmp, product_dict)
+        out = []
+        for _, value in tmp.items():
+            out.append(value)
+        return out
+
     def load_manifest(self):
         """加载manifest.yml并验证schema文件"""
         template = {}

{lbkit-0.8.7 → lbkit-0.8.8}/lbkit/tasks/task_build_manifest.py

@@ -91,7 +91,7 @@ class TaskClass(Task):
         # 使用模板生成litebmc组件的配置
         lookup = TemplateLookup(directories=os.path.join(src_cwd, "template"))
         template = lookup.get_template("conanfile.py.mako")
-        conanfile = template.render(lookup=lookup, pkg=manifest)
+        conanfile = template.render(lookup=lookup, pkg=manifest, real_dependencies=self.config.get_dependencies())
 
         recipe = os.path.join(self.conan_build, "litebmc")
         os.makedirs(recipe, exist_ok=True)

{lbkit-0.8.7 → lbkit-0.8.8}/lbkit/tasks/template/conanfile.py.mako

@@ -17,13 +17,13 @@ class LitebmcConan(ConanFile):
 
     def requirements(self):
         """从manifest.yml文件中提取的依赖组件"""
-    % for dep in pkg["dependencies"]:
+    % for dep in real_dependencies:
         self.requires("${dep["package"]}")
     % endfor
         self.requires("rootfs_df190c/0.0.1")
 
     def configure(self):
-    % for dep in pkg["dependencies"]:
+    % for dep in real_dependencies:
         % if len(dep.get("options", [])) > 0:
 <% name = dep["package"].split("/")[0] %>\
             % for op, ctx in dep["options"].items():

{lbkit-0.8.7 → lbkit-0.8.8/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.8.7
+Version: 0.8.8
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.8.7/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.8.7'