lbkit 0.6.5__tar.gz → 0.6.6__tar.gz

{lbkit-0.6.5/lbkit.egg-info → lbkit-0.6.6}/PKG-INFO

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

lbkit-0.6.6/lbkit/__init__.py

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

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/integration/build_image.py

@@ -25,8 +25,6 @@ class BuildImage(Task):
         """任务入口"""
         """检查manifest文件是否满足schema格式描述"""
         os.chdir(self.config.output_path)
-        cmd = "qemu-system-aarch64 -M virt -cpu cortex-a57 -M virt,dumpdtb=virt.dtb"
-        self.exec(cmd)
 
         mk = MekeEmmcImage(os.path.join(self.config.temp_path, "emmc_tmp_dir"))
         rootfs_size = self.get_manifest_config("metadata/rootfs_size")
@@ -35,7 +33,7 @@ class BuildImage(Task):
         emmc_size = self.get_manifest_config("metadata/emmc_size")
         if emmc_size:
             mk.size_1m = self._trans_to_blk_1m(emmc_size)
-        mk.run("virt.dtb", self.config.rootfs_img, "qemu.img")
+        mk.run(self.config.rootfs_img, "qemu.img")
         cmd = 'cp /usr/share/litebmc/qemu.conf qemu.conf'
         self.exec(cmd)
         output_img = os.path.join(self.config.output_path, "litebmc_qemu.tar.gz")

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/integration/build_manifest.py

@@ -68,6 +68,25 @@ class BuildManifest(Task):
             cmd = f"conan download {pkg} -r {self.config.remote} --only-recipe"
             self.exec(cmd, ignore_error=True)
 
+    def build_rootfs(self):
+        """构建产品rootfs包"""
+        log.info("build rootfs")
+
+        manifest = self.load_manifest()
+        # 使用模板生成litebmc组件的配置
+        lookup = TemplateLookup(directories=os.path.join(src_cwd, "template"))
+        template = lookup.get_template("rootfs.py.mako")
+        conanfile = template.render(lookup=lookup, pkg=manifest)
+
+        recipe = os.path.join(self.conan_build, "rootfs")
+        os.makedirs(recipe, exist_ok=True)
+        os.chdir(recipe)
+        fp = open("conanfile.py", "w", encoding="utf-8")
+        fp.write(conanfile)
+        fp.close()
+
+        self.exec("conan create . " + self.common_args)
+
     def build_litebmc(self):
         """构建产品conan包"""
         log.info("build litebmc")
@@ -88,23 +107,17 @@ class BuildManifest(Task):
         fp.close()
 
         base_cmd = f"{self.common_args} {self.conan_settings}"
-        lockfile = os.path.join(self.config.code_path, "conan.lock")
+        lockfile = os.path.join(self.config.temp_path, "conan.lock")
         threadPool = ThreadPoolExecutor(max_workers=16)
-        # 指定-l参数或conan.lock文件不存在时创建lock文件
-        if self.config.create_conan_lock or not os.path.isfile(lockfile):
-            # 创建新的conan.lock文件
-            for dep in manifest.get("dependencies", []):
-                pkg = dep.get("package")
-                threadPool.submit(self.download_recipe, pkg)
-            lock_cmd = f"conan lock create . {base_cmd} --lockfile-out={lockfile}"
-            self.exec(lock_cmd)
-        else:
-            with open(lockfile, "r") as fp:
-                lock = json.load(fp)
-            for key in ["requires", "build_requires", "python_requires", "config_requires"]:
-                requires = lock.get(key, [])
-                for require in requires:
-                    threadPool.submit(self.download_recipe, require)
+        # 创建新的conan.lock文件
+        lock_cmd = f"conan lock create . {base_cmd} --lockfile-out={lockfile}"
+        self.exec(lock_cmd)
+        with open(lockfile, "r") as fp:
+            lock = json.load(fp)
+        for key in ["requires", "build_requires", "python_requires", "config_requires"]:
+            requires = lock.get(key, [])
+            for require in requires:
+                threadPool.submit(self.download_recipe, require)
         threadPool.shutdown(wait=True)
         graph_cmd = f"conan graph info . {base_cmd} -f json --lockfile={lockfile}"
         graphfile = os.path.join(self.config.temp_path, "graph.info")
@@ -112,11 +125,13 @@ class BuildManifest(Task):
         bcp = BuildConanParallel(graphfile, lockfile, self.common_args, self.config.from_source)
         bcp.build()
 
+        self.exec(f"sed -i 's@rootfs_df190c/0.0.1#.*\"@rootfs_df190c/0.0.1\"@g' {lockfile}")
         # 部署应用到self.config.conan_install
         self.deploy(graphfile)
 
     def run(self):
         """任务入口"""
+        self.build_rootfs()
         self.build_litebmc()
         error = False
         if not self.config.rootfs_tar:

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/integration/build_rootfs.py

@@ -127,6 +127,12 @@ class BuildRootfs(Task):
         if os.path.isdir(product_rootfs):
             self.copy_conan_install(product_rootfs, mnt_path)
 
+        # 设置boot目录权限
+        log.info("设置boot目录权限")
+        self.exec(f"chown 0:0 boot/ -R")
+        self.exec(f"chmod 600 boot/ -R")
+        if os.path.isdir("extlinux"):
+            self.exec(f"chmod 700 boot/extlinux/")
         # 执行rootfs定制化脚本
         os.chdir(self.config.work_dir)
         hook_name = "hook.post_rootfs"

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/integration/config.py

@@ -34,8 +34,6 @@ class Config(object):
         self.profile_build = args.profile_build
         # 编译目标配置项
         self.profile_host = args.profile
-        # 是否创建新的lockfile
-        self.create_conan_lock = args.create_conan_lock
 
         # 设置并创建构建所需目录
         log.info("Work dir: %s", self.work_dir)
@@ -67,7 +65,6 @@ class Config(object):
         parser.add_argument("-pr:b", "--profile_build", help="Apply the specified profile to the build machine", default="default")
         parser.add_argument("-t", "--build_type", type=str, choices=['debug', 'release', 'minsize'], help="Set the build type", default="debug")
         parser.add_argument("-r", "--remote", help="specified conan server", default="litebmc")
-        parser.add_argument("-l", "--create_conan_lock", help="Create new conan.lock", action="store_true")
         return parser
 
     def get_manifest_config(self, key: str, default=None):

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/integration/template/conanfile.py.mako

@@ -20,7 +20,7 @@ class LitebmcConan(ConanFile):
     % for dep in pkg["dependencies"]:
         self.requires("${dep["package"]}")
     % endfor
-        pass
+        self.requires("rootfs_df190c/0.0.1")
 
     def configure(self):
     % for dep in pkg["dependencies"]:

lbkit-0.6.6/lbkit/integration/template/rootfs.py.mako

@@ -0,0 +1,27 @@
+import os
+from conan import ConanFile
+<% dts = pkg.get("metadata", {}).get("dts") %>
+
+class RootfsConan(ConanFile):
+    """用于构建产品的顶层rootfs包"""
+    name = "rootfs_df190c"
+    settings = "os", "arch", "compiler", "build_type"
+    description = "build rootfs component"
+    url = "https://litebmc.com"
+    extension_properties = {
+        "compatibility_cppstd": False,
+        "compatibility_cstd": False
+    }
+    homepage = "https://www.litebmc.com"
+    license = "BSL-1.0"
+    version = "0.0.1"
+
+% if dts:
+    def build_requirements(self):
+        self.tool_requires("dtc/1.7.0")
+
+    def build(self):
+        os.makedirs(self.package_folder + "/boot")
+        self.run(f"dtc -I dts -O dtb ${dts["input"]} -o {self.package_folder}/boot/${dts["output"]}")
+
+% endif

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit/utils/images/emmc.py

@@ -26,7 +26,7 @@ class MakeImage():
             cmd = "umount " + tmp_dir
             self.tools.exec(cmd, ignore_error=True, echo_cmd=False)
 
-    def run(self, dtb, rootfs, output="emmc.img"):
+    def run(self, rootfs, output="emmc.img"):
         blk_1k = self.misc_blk_1k + self.ubootenv_blk_1k + self.vbmeta_blk_1k
         blk_1k += self.rootfs_blk_1m * 1024 * 3
         blk_1k += self.userdata_blk_1m * 1024
@@ -57,26 +57,6 @@ class MakeImage():
         end += self.rootfs_blk_1m * 1024 * 2
         self.log.info("创建rootfs镜像区")
         self.tools.exec(f"parted -s -a none {output} mkpart rootfs_a {start}s {end - 1}s")
-        self.log.info(f"挂载rootfs分区并复制内容，注意，此时会修改原始{rootfs}镜像并添加dtb以及启动参数")
-        self.tools.exec(f"fuse2fs {rootfs} {self.tmp_dir} -o fakeroot -o nonempty")
-        extlinux = os.path.join(self.tmp_dir, "boot/extlinux")
-        os.makedirs(extlinux, exist_ok=True)
-        with open(os.path.join(extlinux, "extlinux.conf"), "w+") as fp:
-            fp.write("menu title U-Boot menu\n")
-            fp.write("prompt 0\n")
-            fp.write("timeout 10\n")
-            fp.write("\n")
-            fp.write("label litebmc-active\n")
-            fp.write("    kernel /boot/Image\n")
-            fp.write("    fdt /boot/litebmc.dtb\n")
-            fp.write("    append console=ttyAMA0 loglevel=10 rootwait root=/dev/nvme0n1p4 rw\n")
-        self.tools.exec(f"cp {dtb} {self.tmp_dir}/boot/litebmc.dtb")
-        self.tools.exec(f"chown 0:0 {self.tmp_dir}/boot/ -R")
-        self.tools.exec(f"chmod 700 {self.tmp_dir}/boot/extlinux/")
-        self.tools.exec(f"chmod 600 {self.tmp_dir}/boot/extlinux/extlinux.conf")
-        self.tools.exec(f"chmod 600 {self.tmp_dir}/boot/Image")
-        self.tools.exec(f"chmod 600 {self.tmp_dir}/boot/litebmc.dtb")
-        self.tools.exec(f"umount {self.tmp_dir}")
         self.log.info("复制镜像文件到rootfs_a区域")
         self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
         self.log.info("制作rootfs_b")
@@ -106,4 +86,4 @@ class MakeImage():
 
 if __name__ == "__main__":
     mk = MakeImage()
-    mk.run("./Image", "./virt.dtb", "./rootfs.img", "./qemu.img")
+    mk.run("./rootfs.img", "./qemu.img")

{lbkit-0.6.5 → lbkit-0.6.6/lbkit.egg-info}/PKG-INFO

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

{lbkit-0.6.5 → lbkit-0.6.6}/lbkit.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ lbkit/integration/build_rootfs.py
 lbkit/integration/config.py
 lbkit/integration/task.py
 lbkit/integration/template/conanfile.py.mako
+lbkit/integration/template/rootfs.py.mako
 lbkit/utils/__init__.py
 lbkit/utils/images/__init__.py
 lbkit/utils/images/emmc.py

lbkit-0.6.5/lbkit/__init__.py

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