lbkit 0.6.0__tar.gz → 0.6.1__tar.gz

{lbkit-0.6.0/lbkit.egg-info → lbkit-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.6.0
+Version: 0.6.1
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -14,12 +14,12 @@ License-File: AUTHORS
 Requires-Dist: pyyaml
 Requires-Dist: colorama
 Requires-Dist: mako
-Requires-Dist: node-semver==0.6.1
+Requires-Dist: node-semver>=0.6.1
 Requires-Dist: jsonschema
 Requires-Dist: conan
 Requires-Dist: requests
 Requires-Dist: gitpython
 Requires-Dist: inflection
-Requires-Dist: meson==1.4.0
+Requires-Dist: meson>=1.4.0
 
 build and code generate tools

lbkit-0.6.1/lbkit/__init__.py

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

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit/build_conan_parallel.py

@@ -1,6 +1,7 @@
 """任务基础类"""
 import os
 import json
+import tempfile
 from queue import Queue
 from threading import Thread
 from lbkit.log import Logger
@@ -92,7 +93,7 @@ class BuildConanParallel(object):
             self.exception = e
         self.queue.put(cp)
 
-    def build(self):
+    def _build(self):
         with open(self.graphinfo, "r") as fp:
             grapth = json.load(fp)
         nodes = grapth.get("graph", {}).get("nodes", {})
@@ -195,3 +196,10 @@ class BuildConanParallel(object):
                 dep.building = False
                 dep.binary_exist = True
 
+
+    def build(self):
+        cwd = os.getcwd()
+        tmp = tempfile.TemporaryDirectory()
+        os.chdir(tmp.name)
+        self._build()
+        os.chdir(cwd)

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit/component/build.py

@@ -190,10 +190,13 @@ class BuildComponent():
     def build(self):
         log.info(os.getcwd())
 
+        export_cmd = f"conan export . --user={self.user} --channel={self.channel}"
+        tools.run(export_cmd, capture_output=False)
+
         lockfile = os.path.join(cwd, ".temp", "conan.lock")
         graphfile = os.path.join(cwd, ".temp", "graph.info")
         lock_cmd = f"conan lock create . {self.base_cmd} --lockfile-out={lockfile}"
-        tools.exec(lock_cmd)
+        tools.run(lock_cmd, capture_output=False)
         graph_cmd = f"conan graph info . {self.base_cmd} -f json --lockfile={lockfile}"
         tools.pipe([graph_cmd], out_file=graphfile)
         log.success(f"start build dependency packages of {self.package}")

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit/component/template/conanbase.mako

@@ -77,9 +77,19 @@ class LiteBmcConan(ConanFile):
             files.update_conandata(self, {"sources": {"commit": None, "url": None, "pwd": os.getcwd()}})
             return
 
-        scm_url, scm_commit = git.get_url_and_commit()
-        if not scm_url.startswith("https://"):
-            print(f"url not startswith https://, use fake conandata.yml instead")
+        scm_url = None
+        remotes = git.run("remote -v")
+        checked_name = []
+        for r in remotes.splitlines():
+            name, url = r.split(maxsplit=1)
+            if name in checked_name:
+                continue
+            checked_name.append(name)
+            url, scm_commit = git.get_url_and_commit(remote=name)
+            if url.startswith("https://"):
+                scm_url = url
+                break
+        if not scm_url:
             files.update_conandata(self, {"sources": {"commit": None, "url": None, "pwd": os.getcwd()}})
             return
         files.update_conandata(self, {"sources": {"commit": scm_commit, "url": scm_url}})

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit/integration/build_rootfs.py

@@ -90,7 +90,7 @@ class BuildRootfs(Task):
         src_dir += "/"
         cmd = f"rsync -aHK --exclude 'include' --exclude '*.a' --chown=0:0 {src_dir} {mnt_path}"
         log.info("copy %s to %s", src_dir, mnt_path)
-        self.exec_easy(cmd, capture_output=False)
+        self.exec(cmd, echo_cmd=False)
         for root, dirs, files in os.walk(src_dir):
             root = root.replace(src_dir, "")
             for dir in dirs:
@@ -105,6 +105,10 @@ class BuildRootfs(Task):
                     continue
                 cmd = f"chown 0:0 {name}"
                 self.exec(cmd, echo_cmd=False)
+                strip = self.get_manifest_config("metadata/strip")
+                if strip:
+                    cmds = [f"file {name}", "grep \"not stripped\", "f"{self.config.strip} -s {name}"]
+                    self.pipe(cmds, error_log="", ignore_error=True)
         per_file = os.path.join(src_dir, "permissions")
         self.do_permission(per_file)
 
@@ -146,42 +150,6 @@ class BuildRootfs(Task):
         cmd = "rm " + os.path.join(self.config.mnt_path, "permissions")
         self.exec(cmd)
 
-        # 清理冗余静态文件
-        cmds = ["find " + self.config.mnt_path + " -name *.a -type f", "xargs -i{} rm {} -f"]
-        self.pipe(cmds)
-
-        # 按manifest配置的大小调整rootfs
-        strip = self.get_manifest_config("metadata/strip")
-        if strip:
-            log.info("Start strip files")
-            file_list = os.path.join(self.config.temp_path, "strip.filelist")
-            unstrip_regex = [
-                "*.yaml$",
-                "*.mo$",
-                "*.target$",
-                "*.service$",
-                "*.md$",
-                "*.html$",
-                "*usr/share/",
-                "*.py$",
-                "*.pc$",
-                "*.mc$",
-                "*.in$",
-                "*.ini$",
-                "*.rules$",
-                "*.conf$"]
-            cmds = ["find " + self.config.mnt_path + " -type f"]
-            for unstrip in unstrip_regex:
-                cmds.append(f"grep -vE {unstrip}")
-            self.pipe(cmds, out_file=file_list)
-
-            cmds = [f"cat {file_list}", "xargs file", "grep 'not stripped'", "awk -F':' '{{print $1}}'"]
-            cmds.append(f"xargs -i{{}} {self.config.strip} -s {{}}")
-            self.pipe(cmds)
-
-        log.info("remove static libraries")
-        cmds = [f"find {self.config.mnt_path} -name *.a", "xargs -i{} rm {}"]
-        self.pipe(cmds)
         log.info("remove all .fuse_hiddeng* files")
         cmds = [f"find {self.config.mnt_path} -name .fuse_hidden*", "xargs -i{} rm {}"]
         self.pipe(cmds)

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit/tools.py

@@ -104,10 +104,13 @@ class Tools(object):
                 raise errors.RunCommandException(f"Run command {real_cmd[0]} failed")
             ret.communicate()
             if ret.returncode != 0:
+                error_log = "Run command ({}) failed, error: {}".format(cmd, ret.stderr)
+                error_log = kwargs.get("error_log", error_log)
                 if ignore_error:
-                    self.log.info("Run command ({}) failed".format(cmd), uptrace=uptrace)
+                    if error_log:
+                        self.log.info(failed_info)
                     return
-                raise errors.RunCommandException(f"command {cmd} return non-zero, error: {ret.stderr}")
+                raise errors.RunCommandException(error_log)
             if stdin:
                 stdin.close()
             stdin = stdout

{lbkit-0.6.0 → lbkit-0.6.1/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.6.0
+Version: 0.6.1
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -14,12 +14,12 @@ License-File: AUTHORS
 Requires-Dist: pyyaml
 Requires-Dist: colorama
 Requires-Dist: mako
-Requires-Dist: node-semver==0.6.1
+Requires-Dist: node-semver>=0.6.1
 Requires-Dist: jsonschema
 Requires-Dist: conan
 Requires-Dist: requests
 Requires-Dist: gitpython
 Requires-Dist: inflection
-Requires-Dist: meson==1.4.0
+Requires-Dist: meson>=1.4.0
 
 build and code generate tools

{lbkit-0.6.0 → lbkit-0.6.1}/lbkit.egg-info/requires.txt

@@ -1,10 +1,10 @@
 pyyaml
 colorama
 mako
-node-semver==0.6.1
+node-semver>=0.6.1
 jsonschema
 conan
 requests
 gitpython
 inflection
-meson==1.4.0
+meson>=1.4.0

{lbkit-0.6.0 → lbkit-0.6.1}/setup.py

@@ -19,7 +19,7 @@ setup(
     description="Tools provided by litebmc.com",
     long_description="build and code generate tools",
     long_description_content_type="text/markdown",
-    install_requires=["pyyaml", "colorama", "mako", "node-semver==0.6.1", "jsonschema", "conan", "requests", "gitpython", "inflection", "meson==1.4.0"],
+    install_requires=["pyyaml", "colorama", "mako", "node-semver>=0.6.1", "jsonschema", "conan", "requests", "gitpython", "inflection", "meson>=1.4.0"],
     url="https://www.litebmc.com",
     packages=find_packages(),
     include_package_data=True,

lbkit-0.6.0/lbkit/__init__.py

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