Merge pull request #8 from Guohezu001/main

Add:"ci" and Optimized sd.image packing scripts

Author: BernardXiong

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
           sudo add-apt-repository ppa:xmake-io/xmake -y
           sudo apt update
           sudo apt install -y nim
-          sudo apt install -y xmake python3-pip
+          sudo apt install -y xmake python3-pip qemu-system-aarch64
           pip install --upgrade pip
           pip install kconfiglib scons requests tqdm psutil
 
@@ -31,4 +31,24 @@ jobs:
           cd models
           xmake -vyD
           '
-        shell: bash
+        shell: bash
+
+      - name: Set file permissions
+        run: |
+          chmod +r ./models/rtthread.bin
+          chmod +r ./models/build/ext4.img
+          ls -lh ./models/build/
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: |
+            ./models/rtthread.bin
+            ./models/build/ext4.img
+          retention-days: 7
+
+      - name: Run QEMU and Execute /bin/hello
+        run: |
+          chmod +x ./.github/workflows/run_qemu.sh
+          ./.github/workflows/run_qemu.sh

.github/workflows/run_qemu.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# 启动 QEMU 并运行 rtthread.bin 和 ext4.img
+qemu-system-aarch64 -M virt,gic-version=2 -cpu cortex-a53 -m 128M -smp 4 -kernel ./models/rtthread.bin -nographic \
+-drive if=none,file=./models/build/ext4.img,format=raw,id=blk0 \
+-device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
+-netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
+-device virtio-serial-device \
+-chardev socket,host=127.0.0.1,port=4321,server=on,wait=off,telnet=on,id=console0 \
+-device virtserialport,chardev=console0 \
+-nographic \
+-append "console=ttyAMA0" &
+
+# 等待 10 秒钟，以便 QEMU 启动并执行 /bin/hello
+sleep 10
+
+# 在 QEMU 虚拟机上执行 /bin/hello 任务
+echo "Running /bin/hello in QEMU..."
+telnet 127.0.0.1 4321 <<EOF
+/bin/hello
+EOF
+
+# 等待 10 秒后杀死 QEMU 进程
+sleep 10
+echo "Terminating QEMU..."
+pkill -f "qemu-system-aarch64"

repo/packages/r/rt-thread/xmake.lua

@@ -56,7 +56,7 @@ do
             return config_key
         end
 
-        local vendor = get_config_values(config_file, "CONFIG_VENDOR_", "CONFIG_CHIP_MODEL_", "CONFIG_BOARD_", "CONFIG_KERNEL_SOURCE_")
+        local vendor = get_config_values(config_file, "CONFIG_VENDOR_")
         local model = get_config_values(config_file, "CONFIG_CHIP_MODEL_")
         local board = get_config_values(config_file, "CONFIG_BOARD_")
         local company = get_config_values(config_file, "CONFIG_COMPANY_")

tools/scripts/tasks/sdk-image/on_run.lua

@@ -106,8 +106,8 @@ local function get_other_files_from_curdir()
     return files
 end
 
-function main()
-
+-- rk3500的sd.image打包函数
+local function packages_rk3500()
     -- 获取文件路径
     local rtthread_bin = get_kernel_from_curdir()        -- 获取内核文件
     local rootfs_img = get_rootfs_from_curdir()          -- 获取根文件系统
@@ -117,10 +117,7 @@ function main()
     local uboot_img = other_files.uboot
     local fdt = other_files.fdt
     local idbloader_img = other_files.idbloader
-
-    -- 删除现有镜像文件
-    os.iorun("rm sd.img -f")
-
+    
     -- 确保文件存在
     check_required_param(rtthread_bin, "kernel")
     check_required_param(uboot_img, "uboot")
@@ -131,7 +128,7 @@ function main()
     -- 镜像文件名
     local imgname = "sd.img"
     local pwd = os.getenv("PWD")
-    
+
     -- 创建空白的 sd.img 文件并初始化
     os.execv("dd", {"if=/dev/zero", "of="..pwd .. "/" .. imgname, "bs=1M", "count=1000"})
     os.execv("ls -al")
@@ -161,3 +158,23 @@ function main()
     -- 清理临时的 boot.img 文件
     os.iorun("rm boot.img")
 end
+
+function main()
+    -- 删除现有镜像文件
+    os.iorun("rm sd.img -f")
+
+    local config_file = ".config"
+    local file = io.open(config_file, "r")
+    local content = file:read("*all")
+    file:close()
+    local vendor = content:match("CONFIG_VENDOR_" .. "([^%s=]*)=y")
+    local model = content:match("CONFIG_CHIP_MODEL_" .. "([^%s=]*)=y")
+    print("sdk_vendor:",vendor)
+    if vendor == "QEMU" then 
+    end
+    if vendor == "ROCKCHIP" then
+        if model == "RK3568" then
+            packages_rk3500()
+    end
+    end
+end