Merge pull request #6 from Guohezu001/main

fix:some apps not packaged error

Author: BernardXiong

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI Build
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Install Dependencies
+        run: |
+          sudo apt update
+          sudo add-apt-repository ppa:xmake-io/xmake -y
+          sudo apt update
+          sudo apt install -y nim
+          sudo apt install -y xmake python3-pip
+          pip install --upgrade pip
+          pip install kconfiglib scons requests tqdm psutil
+
+      - name: Setup Environment and Build
+        run: |
+          # 使用 bash 作为 shell
+          bash -c '
+          source env.sh
+          cd models
+          xmake -vyD
+          '
+        shell: bash

env.sh

@@ -29,3 +29,6 @@ if ! command -v unzip &> /dev/null; then
 else
     echo "smart-build env ready!"
 fi
+
+export PATH=`python3 -m site --user-base`/bin:$HOME/.env/tools/scripts:$PATH
+export RTT_EXEC_PATH=/usr/bin

models/.config

@@ -1,16 +1,23 @@
-# CONFIG_VENDOR_NXP is not set
+CONFIG_TARGET_FILE=""
 # CONFIG_VENDOR_ROCKCHIP is not set
 CONFIG_VENDOR_QEMU=y
-# CONFIG_VENDOR_CVITEK is not set
 CONFIG_BOARD_VIRT64_AARCH64=y
 # CONFIG_BOARD_VEXPRESS_A9 is not set
 
 #
-# Application Configuration
+# Kernel Configuration
+#
+CONFIG_KERNEL_SOURCE_GIT=y
+# CONFIG_KERNEL_SOURCE_LOCAL is not set
+# end of Kernel Configuration
+
+#
+# Selection the desired apps Application
 #
 CONFIG_APP_BUSYBOX=y
-CONFIG_APP_CPP=y
-CONFIG_APP_FFMPEG=y
+CONFIG_FORCE_APP_BUSYBOX=y
+# CONFIG_APP_CPP is not set
+# CONFIG_APP_FFMPEG is not set
 CONFIG_APP_HELLO=y
 # CONFIG_APP_MICROPYTHON is not set
 # CONFIG_APP_PLAYER is not set
@@ -21,4 +28,4 @@ CONFIG_APP_HELLO=y
 # CONFIG_APP_WEBCLIENT is not set
 # CONFIG_APP_WEBSERVER is not set
 # CONFIG_APP_ZLIB is not set
-# end of Application Configuration
+# end of Selection the desired apps Application

models/.config.old

@@ -6,16 +6,16 @@ config TARGET_FILE
 mainmenu "Chip and Board Configuration"
 
 #
-# 厂商选择
+# 芯片厂商选择
 #
 choice
     prompt "Select Vendor"
-    default VENDOR_NXP
+    default VENDOR_QEMU
 
-config VENDOR_NXP
-    bool "NXP"
-    help
-      Select NXP vendor.
+#config VENDOR_NXP
+#    bool "NXP"
+#    help
+#      Select NXP vendor.
 
 config VENDOR_ROCKCHIP
     bool "Rockchip"
@@ -27,10 +27,10 @@ config VENDOR_QEMU
     help
       Select QEMU vendor.
 
-config VENDOR_CVITEK
-    bool "Cvitek"
-    help
-      Select Cvitek vendor.
+#config VENDOR_CVITEK
+#    bool "Cvitek"
+#    help
+#      Select Cvitek vendor.
 
 endchoice
 
@@ -60,7 +60,7 @@ if VENDOR_NXP
     endchoice
 
     #
-    # 根据选择的芯片配置开发板
+    # 根据选择的芯片配置开发板厂商
     #
     if CHIP_MODEL_IMX
         choice
@@ -133,29 +133,41 @@ endif
 # 如果选择了 Rockchip，配置相应芯片和开发板
 #
 if VENDOR_ROCKCHIP
-    choice
-        prompt "Select Chip Model for Rockchip"
-        default CHIP_MODEL_RK3500
-
-    config CHIP_MODEL_RK3500
-        bool "RK3500 Chip"
+    menu "RKxx soc"
+    config CHIP_MODEL_RK3568
+        bool "RK3568 Chip"
+        default y
         help
-          Select RK3500 chip.
+          Select RK3568 series chips.
+    endmenu
+    #
+    # 根据 RK3568 芯片选择开发板
+    #
+    if CHIP_MODEL_RK3568
+        menu "FriendlyARM Company"
 
-    endchoice
+            config COMPANY_FRIENDLY
+                bool "FriendlyARM Company"
+                default y
+                help
+                  Select FriendlyARM Company for RK3568.
 
-    choice
-        prompt "Select Development Board for RK3500"
-        default BOARD_RK3500
+            if COMPANY_FRIENDLY
+                menu "NanoPi Series"
 
-    config BOARD_RK3500
-        bool "RK3500 Development Board"
-        help
-          Select RK3500 development board.
+                    config BOARD_NANOPI_R5S
+                        bool "NanoPi R5S Board"
+                        help
+                          Select NanoPi R5S board for RK3568.
 
-    endchoice
+                endmenu
+            endif
+
+        endmenu
+    endif
 endif
 
+
 #
 # 如果选择了 QEMU，配置相应的开发板
 #
@@ -177,17 +189,88 @@ if VENDOR_QEMU
     endchoice
 endif
 
+#
+# 可选内核来源，如果本地有rt-thread仓库，可以指定本地目录，xmake编译过程中将不会再次拉取rt-thread仓库
+#
+menu "Kernel Configuration"
+
+choice KERNEL_SOURCE
+    prompt "Select Kernel Source"
+    help
+      Choose how to provide the kernel source.
+    default KERNEL_SOURCE_GIT
+
+config KERNEL_SOURCE_GIT
+    bool "Fetch from Git repository"
+    help
+      Fetch the kernel source from a Git repository.
+
+config KERNEL_SOURCE_LOCAL
+    bool "Use a local directory"
+    help
+      Use an existing kernel source directory on the local file system.
+
+endchoice
+
+config KERNEL_LOCAL_DIR
+    string "Local Kernel Directory"
+    default "/home/rtthread/rt-thread/"
+    depends on KERNEL_SOURCE_LOCAL
+    help
+      Specify the path to the local kernel source directory. This option
+      is only available if "Use a local directory" is selected above.
+
+endmenu
+
+
+#
+# 可选交叉编译工具链来源，如果本地有toolchain，可以指定本地目录，xmake编译过程中将不会再次拉取交叉编译工具链
+#
+#menu "toolchain Configuration"
+#
+#choice TOOLCHAIN_SOURCE
+#    prompt "Select toolchain Source"
+#    help
+#      Choose how to provide the toolchain source.
+#    default TOOLCHAIN_SOURCE_GIT
+#
+#config TOOLCHAIN_SOURCE_GIT
+#    bool "Fetch from Git repository"
+#    help
+#      Fetch the TOOLCHAIN source from a Git repository.
+#
+#config TOOLCHAIN_SOURCE_LOCAL
+#    bool "Use a local directory"
+#    help
+#      Use an existing toolchain source directory on the local file system.
+#
+#endchoice
+#
+#config TOOLCHAIN_LOCAL_DIR
+#    string "Local toolchain Directory"
+#    default "/home/rtthread/tool/a/aarch64-smart-musleabi/"
+#    depends on TOOLCHAIN_SOURCE_LOCAL
+#    help
+#      Specify the path to the local toolchain source directory. This option
+#      is only available if "Use a local directory" is selected above.
+#
+#endmenu
 
 #
 # 选择开发板后，配置您想使用的 app
 #
-menu "Application Configuration"
+menu "Selection the desired apps Application"
 
 config APP_BUSYBOX
     bool "busybox"
     help
       Select busybox application.
 
+config FORCE_APP_BUSYBOX
+    bool
+    default y
+    select APP_BUSYBOX
+
 config APP_CPP
     bool "cpp"
     help

models/Kconfig

@@ -23,7 +23,7 @@
 add_rules("mode.debug", "mode.release")
 
 add_requires("apps")
--- add_requires("rt-thread")
+
 add_requires("xmake::rt-thread", {optional = true})
 
 target("image")
@@ -45,7 +45,7 @@ target("image")
     after_build(function (target)
         os.exec("xmake smart-rootfs")
         os.exec("xmake smart-image")
-        -- os.exec("xmake sdk")
+        os.exec("xmake sdk")
     end)
 
 target_end()

models/xmake.lua

@@ -0,0 +1,30 @@
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- You may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2023-2023 RT-Thread Development Team
+--
+-- @author      zchenxiao
+-- @file        deploy.lua
+--
+-- Change Logs:
+-- Date           Author       Notes
+-- ------------   ----------   -----------------------------------------------
+-- 2025-01-14     zchenxiao       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    for _, filepath in ipairs(os.files(path.join(installdir, "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "bin", filename))
+    end
+end

repo/packages/c/cpp/scripts/deploy.lua

@@ -30,12 +30,28 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "cpp", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
-        
+
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
 
         import("package.tools.xmake").install(package)
+        end
     end)
 
 end