lbkit 0.5.10__tar.gz → 0.5.12__tar.gz

{lbkit-0.5.10/lbkit.egg-info → lbkit-0.5.12}/PKG-INFO

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

lbkit-0.5.12/lbkit/__init__.py

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

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/codegen/codegen.py

@@ -17,7 +17,7 @@ from lbkit.misc import SmartFormatter
 lb_cwd = os.path.split(os.path.realpath(__file__))[0]
 log = Logger("codegen")
 
-__version__=1
+__version__=2
 
 class CodeGen(object):
     def __init__(self, args):

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/codegen/template/public.h.mako

@@ -149,7 +149,10 @@ typedef struct {
 } ${class_name}_${method.name}_Rsp;
 
 % if not method.is_plugin:
-typedef int (*${class_name}_${method.name}_Method)(const ${class_name} *object, const ${class_name}_${method.name}_Req *req, ${class_name}_${method.name}_Rsp **rsp, GError **error);
+typedef int (*${class_name}_${method.name}_Method)(const ${class_name} *object,
+    const ${class_name}_${method.name}_Req *req,
+    ${class_name}_${method.name}_Rsp **rsp,
+    GError **error, gpointer ext_data);
 % endif
 void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **value);
 void ${class_name}_${method.name}_Rsp_free(${class_name}_${method.name}_Rsp **value);

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/component/build.py

@@ -4,6 +4,7 @@ import yaml
 import shutil
 import re
 import json
+from multiprocessing import Pool
 import traceback
 from argparse import ArgumentParser
 from jsonschema import validate, ValidationError
@@ -34,11 +35,22 @@ class DeployComponent():
         package_folder = tools.run(cmd).stdout.strip()
         log.info(f">>>> deploy {self.package_ref}")
         cmd = f"cp -rT {package_folder}/ {self.rootfs_dir}"
-        tools.exec(cmd)
+        cnt = 10
+        while cnt > 0:
+            try:
+                cnt -= 1
+                tools.exec(cmd)
+                return
+            except Exception as e:
+                if cnt == 0:
+                    log.warn("Copy failed, msg: " + str(e))
+                    raise e
+                log.info("Copy {self.package_ref} failed, try again")
 
 
 class BuildComponent():
     def __init__(self, args_parser: ArgumentParser, args=None):
+        self.deploy_success = True
         self.options = args_parser.parse_args(args)
         self.options.build_type = self.options.build_type.capitalize()
         if self.options.channel is None or self.options.channel.strip() == "":
@@ -117,10 +129,11 @@ class BuildComponent():
         # 准备部署依赖
         requires = pkg.get("requires")
         if requires is not None:
-            for rt in requires.get("test", []):
-                conan = rt.get("conan")
-                if conan is not None:
-                    self.runtime_packages.append(conan)
+            if self.options.test:
+                for rt in requires.get("test", []):
+                    conan = rt.get("conan")
+                    if conan is not None:
+                        self.runtime_packages.append(conan)
             for rt in requires.get("compile", []):
                 conan = rt.get("conan")
                 if conan is not None:
@@ -171,6 +184,10 @@ class BuildComponent():
         tools.exec(cmd, verbose=True)
         os.chdir(cwd)
 
+    def _copy_failed(self, result):
+        print(result)
+        self.deploy_success = False
+
     def deploy(self):
         log.success(f"start deplay {self.package} and it's dependencies to ./temp/rootfs")
         # 生成部署deploy命令
@@ -193,6 +210,7 @@ class BuildComponent():
         res = tools.run(cmd).stdout.strip()
         graph = json.loads(res)
         nodes = graph.get("graph", {}).get("nodes", {})
+        pool = Pool()
         for id, info in nodes.items():
             ref = info.get("ref")
             id = info.get("package_id")
@@ -200,7 +218,11 @@ class BuildComponent():
             if context != "host":
                 continue
             dep = DeployComponent(ref, id, self.rootfs_dir)
-            dep.run()
+            pool.apply_async(dep.run, error_callback=self._copy_failed)
+        pool.close()
+        pool.join()
+        if not self.deploy_success:
+            raise Exception("Deploy component failed")
 
         # 设置ROOTFS_DIR环境变量，为DT测试提供相对路径
         os.environ["ROOTFS_DIR"] = self.rootfs_dir

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/integration/build_image.py

@@ -17,7 +17,9 @@ class BuildImage(Task):
         tar_file = os.path.join(self.config.download_path, "uboot.tar.gz")
 
         url = self.get_manifest_config("components/uboot/url")
-        sha256 = self.get_manifest_config("components/uboot/sha256")
+        sha256 = None
+        if not self.config.not_check_download_sha:
+            sha256 = self.get_manifest_config("components/uboot/sha256")
         self.tools.download(url, tar_file, sha256)
         tar = tarfile.open(tar_file)
         members = tar.getmembers()
@@ -41,7 +43,9 @@ class BuildImage(Task):
         tar_file = os.path.join(self.config.download_path, "kernel.tar.gz")
 
         url = self.get_manifest_config("components/kernel/url")
-        sha256 = self.get_manifest_config("components/kernel/sha256")
+        sha256 = None
+        if not self.config.not_check_download_sha:
+            sha256 = self.get_manifest_config("components/kernel/sha256")
         self.tools.download(url, tar_file, sha256)
         tar = tarfile.open(tar_file)
         members = tar.getmembers()

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/integration/build_rootfs.py

@@ -64,7 +64,9 @@ class BuildRootfs(Task):
         rootfs_tar = "rootfs.tar.gz"
 
         url = self.get_manifest_config("components/rootfs/url")
-        sha256 = self.get_manifest_config("components/rootfs/sha256")
+        sha256 = None
+        if not self.config.not_check_download_sha:
+            sha256 = self.get_manifest_config("components/rootfs/sha256")
         self.tools.download(url, rootfs_tar, sha256)
         tar = tarfile.open(rootfs_tar)
         members = tar.getmembers()

{lbkit-0.5.10 → lbkit-0.5.12}/lbkit/integration/config.py

@@ -25,6 +25,7 @@ class Config(object):
         self.build_debug = args.debug
         # conan中心仓
         self.remote = args.remote
+        self.not_check_download_sha = args.not_check_download_sha
 
         if not os.path.isfile(self.manifest):
             raise FileNotFoundError(f"File {args.manifest} not exist")
@@ -61,5 +62,6 @@ class Config(object):
         parser.add_argument("-pr", "--profile", help="Apply the specified profile to the host machine", default="litebmc.ini")
         parser.add_argument("-pr:b", "--profile_build", help="Apply the specified profile to the build machine", default="default")
         parser.add_argument("-d", "--debug", help="Set the build type to debug", action="store_false")
+        parser.add_argument("--not_check_download_sha", help="don't check sha256 of download file", action="store_true")
         parser.add_argument("-r", "--remote", help="specified conan server", default="litebmc")
         return parser

{lbkit-0.5.10 → lbkit-0.5.12/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.10/lbkit/__init__.py

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