Merge pull request #40 from xqyjlj/tools-dev

update tools

Author: BernardXiong

.gitattributes

@@ -11,8 +11,6 @@
 *.xmind binary
 *.bmp binary
 *.exe binary
-fatdisk-x86 binary
-udb binary
 *.lzma binary
 *.zip binary
 *.Z binary
@@ -21,11 +19,15 @@ udb binary
 *.mo binary
 *.pb binary
 *.tga binary
-xfel binary
-make_ext4fs* binary
 *.deb binary
 *.bin binary
 *.img binary
 
+cromfs-tool-* binary
+xfel binary
+make_ext4fs-* binary
+fatdisk-* binary
+udb binary
+
 # These should also not be modified by git.
 *.svg -text

README.md

@@ -40,11 +40,12 @@ xmake 是一个基于 Lua 的轻量级跨平台构建工具，使用 xmake.lua 
 
 3. **安装 qemu**
 
-   userapps 已提供 qemu 7.1.0 的安装包，位于目录 tools/qemu/qemu_7.1.0-2022111713_amd64.deb
+   userapps 已提供 qemu 7.1.0 的安装包，请自行下载 https://download_redirect.rt-thread.org/download/rt-smart/native/tools/qemu/qemu_7.1.0-2022111713_amd64.deb
 
    ```shell
    sudo apt-get install -y libglib2.0-dev libpixman-1-dev
-   sudo dpkg -i ./qemu_7.1.0-2022111713_amd64.deb
+   curl -L https://download_redirect.rt-thread.org/download/rt-smart/native/tools/qemu/qemu_7.1.0-2022111713_amd64.deb -o ./qemu.deb
+   sudo dpkg -i ./qemu.deb
    ```
 
    如若想安装最新版本，请自行下载 qemu 源码进行编译安装
@@ -93,11 +94,11 @@ xmake 是一个基于 Lua 的轻量级跨平台构建工具，使用 xmake.lua 
 
    在 qemu 中 输入 `ctrl+a` 抬起后，再输入 `x` 即可退出 qemu
 
-## prebuilt的版本
+## prebuilt 的版本
 
-会在每天凌晨生成aarch64/riscv64 for qemu的prebuilt版本，包括内核和rootfs文件系统：
+会在每天凌晨生成 aarch64/riscv64 for qemu 的 prebuilt 版本，包括内核和 rootfs 文件系统：
 
-* [aarch64](http://117.143.63.254:9012/www/rt-smart/prebuilt/qemu-virt64-aarch64_latest.tar.gz)
-* [riscv64](http://117.143.63.254:9012/www/rt-smart/prebuilt/qemu-virt64-riscv_latest.tar.gz)
+- [aarch64](http://117.143.63.254:9012/www/rt-smart/prebuilt/qemu-virt64-aarch64_latest.tar.gz)
+- [riscv64](http://117.143.63.254:9012/www/rt-smart/prebuilt/qemu-virt64-riscv_latest.tar.gz)
 
-可以使用qemu来运行起来。
+可以使用 qemu 来运行起来。

tools/cromfs/cromfs-tool-x86

@@ -32,7 +32,8 @@ do
         options = {
             {"f",   "format",           "kv",   "ext4",                                     "image format",
                                                                                             "    - ext4",
-                                                                                            "    - fat"},
+                                                                                            "    - fat",
+                                                                                            "    - cromfs"},
             {"s",   "size",             "kv",   "256M",                                     "image size"},
             {"o",   "output",           "kv",   nil,                                        "output image dir"},
             {"r",   "rootfs",           "kv",   nil,                                        "rootfs dir"},

tools/cromfs/cromfs-tool.exe

@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        on_run.lua
 --
 -- Change Logs:
@@ -50,17 +50,40 @@ function make_fat(size, output, rootfs)
     local fatdisk_exec
     local fatdisk_dir = path.absolute("../../../fatdisk", os.scriptdir())
 
-    if not os.host() == "linux" then
+    if os.host() == "windows" then
+        fatdisk_exec = path.join(fatdisk_dir, "fatdisk.exe")
+    elseif os.host() == "linux" then
+        if os.is_arch("x86_64", "x86", "x64") then
+            fatdisk_exec = path.join(fatdisk_dir, "fatdisk-x86")
+        else
+            os.raise("not support arch '%s'", os.arch())
+        end
+    else
         os.raise("not support host '%s'", os.host())
     end
 
-    if os.arch() == "x86_64" then
-        fatdisk_exec = path.join(fatdisk_dir, "fatdisk-x86")
+    os.vrunv(fatdisk_exec, {"--disk_size=" .. size, "--output=" .. output, "--input=" .. rootfs})
+end
+
+function make_cromfs(output, rootfs)
+    local target
+    local rootfs_dir
+    local cromfs_exec
+    local cromfs_dir = path.absolute("../../../cromfs", os.scriptdir())
+
+    if os.host() == "windows" then
+        cromfs_exec = path.join(cromfs_dir, "cromfs-tool.exe")
+    elseif os.host() == "linux" then
+        if os.is_arch("x86_64", "x86", "x64") then
+            cromfs_exec = path.join(cromfs_dir, "cromfs-tool-x86")
+        else
+            os.raise("not support arch '%s'", os.arch())
+        end
     else
-        os.raise("not support arch '%s'", os.arch())
+        os.raise("not support host '%s'", os.host())
     end
 
-    os.vrunv(fatdisk_exec, {"--disk_size=" .. size, "--output=" .. output, "--input=" .. rootfs})
+    os.vrunv(cromfs_exec, {rootfs, output})
 end
 
 function main()
@@ -93,6 +116,8 @@ function main()
         make_ext4(size, output, rootfs)
     elseif format == "fat" then
         make_fat(size, output, rootfs)
+    elseif format == "cromfs" then
+        make_cromfs(output, rootfs)
     else
         os.raise("unsupport format '%s'", format)
     end