feat: 一些新功能和修复

1.启用初步 DRM 显示支持
2.预装 gostc 内网穿透
3.修复 systemd.journal 缺失问题

.github/workflows/build_img.yaml

@@ -9,11 +9,14 @@ on:
         type: choice
         options:
           - onecloud
+          - onecloud-pro
           - cumebox2
           - chainedbox
           - vm
           - e900v22c
           - octopus-flanet
+          - orangepi-zero
+          - oec-turbo
           - all
       create_release:
         description: 'Create GitHub Release'

build/Dockerfile

@@ -68,8 +68,9 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
                 ;; \
         arm64) \
             apt-get install -y --no-install-recommends \
-                v4l-utils libv4l-0 \
-                libstdc++6 \
+                v4l-utils libv4l-0 libavutil57 \
+                libstdc++6 libavcodec59 libavformat59 \
+                libswscale6 libavfilter8 libavdevice59 \
                 libva2 libva-drm2 libva-x11-2 \
                 libvdpau1 ocl-icd-libopencl1 \
                 ;; \
@@ -86,6 +87,18 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
        fi \
     && curl https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.$ARCH -L -o /usr/local/bin/ttyd \
     && chmod +x /usr/local/bin/ttyd \
+    && mkdir -p /tmp/gostc && cd /tmp/gostc \
+    && case ${TARGETARCH} in \
+        amd64) GOSTC_ARCH=amd64_v1 ;; \
+        arm) GOSTC_ARCH=arm_7 ;; \
+        arm64) GOSTC_ARCH=arm64_v8.0 ;; \
+        *) echo "Unsupported architecture for gostc: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && curl -L https://github.com/mofeng-git/gostc-open/releases/download/v2.0.8-beta.2/gostc_linux_${GOSTC_ARCH}.tar.gz -o gostc.tar.gz \
+    && tar -xzf gostc.tar.gz \
+    && mv gostc /usr/bin/ \
+    && chmod +x /usr/bin/gostc \
+    && cd / && rm -rf /tmp/gostc \
     && adduser kvmd --gecos "" --disabled-password \
     && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \
     && mkdir -p /etc/kvmd_backup/override.d \

build/Dockerfile-stage-0

@@ -54,16 +54,13 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis
         mesa-vdpau-drivers \
         v4l-utils \
         libv4l-dev \
-	&& if [ ${TARGETARCH} != arm64 ]; then \
-		apt-get install -y --no-install-recommends \
-			ffmpeg \
-			libavcodec-dev \
-			libavformat-dev \
-			libavutil-dev \
-			libswscale-dev \
-			libavfilter-dev \
-			libavdevice-dev; \
-	fi \
+        ffmpeg \
+        libavcodec-dev \
+        libavformat-dev \
+        libavutil-dev \
+        libswscale-dev \
+        libavfilter-dev \
+        libavdevice-dev \
 	&& if [ ${TARGETARCH} != arm ] && [ ${TARGETARCH} != arm64 ]; then \
 		apt-get install -y --no-install-recommends \
 			vainfo \
@@ -148,7 +145,7 @@ RUN git clone --depth=1 https://gitlab.freedesktop.org/libnice/libnice /tmp/libn
 
 # 编译 Rockchip MPP、RGA 和 FFmpeg（仅 arm64）
 RUN if [ ${TARGETARCH} = arm64 ]; then \
-    	git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git /tmp/rkmpp \
+    	git clone --depth=1 https://github.com/rockchip-linux/mpp.git /tmp/rkmpp \
     	&& mkdir -p /tmp/rkmpp/rkmpp_build && cd /tmp/rkmpp/rkmpp_build \
     	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_TEST=OFF .. \
     	&& make -j$(nproc) \
@@ -158,21 +155,17 @@ RUN if [ ${TARGETARCH} = arm64 ]; then \
     	&& meson setup rkrga rkrga_build --prefix=/usr --libdir=lib --buildtype=release -Dcpp_args=-fpermissive -Dlibdrm=false -Dlibrga_demo=false \
     	&& meson configure rkrga_build > /dev/null \
     	&& ninja -C rkrga_build install \
-    	&& git clone --depth=1 https://github.com/nyanmisaka/ffmpeg-rockchip.git /tmp/ffmpeg-rockchip \
-    	&& cd /tmp/ffmpeg-rockchip \
-    	&& ./configure --prefix=/usr --enable-gpl --enable-version3 --enable-libdrm --enable-rkmpp --enable-rkrga \
-          --enable-libv4l2 --enable-libx264 --enable-shared --disable-programs \
-          --disable-doc --disable-htmlpages --disable-manpages --disable-network  --disable-protocols \
-          --disable-decoders --disable-debug --disable-alsa \
-    	&& make -j$(nproc) \
-    	&& make install \
-    	&& rm -rf /tmp/rkmpp /tmp/rkrga /tmp/ffmpeg-rockchip; \
+        && rm -rf /tmp/rkmpp /tmp/rkrga; \
     fi
 
 # 编译 ustreamer
 RUN sed --in-place --expression 's|^#include "refcount.h"$|#include "../refcount.h"|g' /usr/include/janus/plugins/plugin.h \
     && git clone --depth=1 https://github.com/mofeng-git/ustreamer /tmp/ustreamer \
-    && make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 -C /tmp/ustreamer \
+    && if [ ${TARGETARCH} = arm64 ]; then \
+        make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 WITH_MPP=1 WITH_DRM=1 -C /tmp/ustreamer; \
+    else \
+        make -j$(nproc) WITH_PYTHON=1 WITH_JANUS=1 WITH_FFMPEG=1 WITH_DRM=1 -C /tmp/ustreamer; \
+    fi \
     && /tmp/ustreamer/ustreamer -v \
     && /tmp/ustreamer/ustreamer-dump -v \
     && cp /tmp/ustreamer/python/dist/*.whl /tmp/wheel/
@@ -186,9 +179,8 @@ RUN mkdir /tmp/lib \
     && find /usr/lib -name "libsrtp2.so.*" -exec cp {} /tmp/lib/ \; \
     && find /usr/lib -name "libwebsockets.so.*" -exec cp {} /tmp/lib/ \; \
     && if [ ${TARGETARCH} = arm64 ]; then \
-        find /usr/lib -name "libav*.so.*" -exec cp {} /tmp/lib/ \; \
-        && find /usr/lib -name "libsw*.so.*" -exec cp {} /tmp/lib/ \; \
+        find /usr/lib -name "libsw*.so.*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "libpostproc.so.*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "librockchip*" -exec cp {} /tmp/lib/ \; \
         && find /usr/lib -name "librga.so.*" -exec cp {} /tmp/lib/ \; ; \
-    fi
+    fi

build/build_img.sh

@@ -59,7 +59,7 @@ build_target() {
         onecloud)
             onecloud_rootfs
             local arch="armhf"
-            local device_type="gpio"
+            local device_type="gpio-onecloud"
             local network_type="systemd-networkd"
             ;;
         cumebox2)
@@ -97,6 +97,27 @@ build_target() {
             local network_type=""
             NEED_PREPARE_DNS=true
             ;;
+        onecloud-pro)
+            onecloud_pro_rootfs
+            local arch="aarch64"
+            local device_type="gpio-onecloud-pro video1"
+            local network_type="systemd-networkd"
+            NEED_PREPARE_DNS=true
+            ;;
+        orangepi-zero)
+            orangepizero_rootfs
+            local arch="armhf"
+            local device_type=""
+            local network_type=""
+            NEED_PREPARE_DNS=true
+            ;;
+        oec-turbo)
+            oec_turbo_rootfs
+            local arch="aarch64"
+            local device_type="vpu"
+            local network_type=""
+            NEED_PREPARE_DNS=true
+            ;;
         *)
             echo "错误：未知或不支持的目标 '$target'" >&2
             exit 1
@@ -124,12 +145,21 @@ build_target() {
         chainedbox)
             pack_img "Chainedbox"
             ;;
-         e900v22c)
+        e900v22c)
             pack_img "E900v22c"
             ;;
-         octopus-flanet)
+        octopus-flanet)
             pack_img "Octopus-Flanet"
             ;;
+        onecloud-pro)
+            pack_img "Onecloud-Pro"
+            ;;
+        orangepi-zero)
+            pack_img "Orangepi-Zero"
+            ;;
+        oec-turbo)
+            pack_img "OEC-Turbo"
+            ;;
         *)
             echo "错误：未知的打包类型 for '$target'" >&2
             ;;
@@ -148,7 +178,7 @@ build_target() {
 # 检查是否提供了目标参数
 if [ -z "$1" ]; then
     echo "用法: $0 <target|all>"
-    echo "可用目标: onecloud, cumebox2, chainedbox, vm, e900v22c, octopus-flanet"
+    echo "可用目标: onecloud, cumebox2, chainedbox, vm, e900v22c, octopus-flanet, onecloud-pro, orangepi-zero, oec-turbo"
     exit 1
 fi
 
@@ -167,6 +197,9 @@ if [ "$1" = "all" ]; then
     build_target "vm"
     build_target "e900v22c"
     build_target "octopus-flanet"
+    build_target "onecloud-pro"
+    build_target "orangepi-zero"
+    build_target "oec-turbo"
     echo "信息：所有目标构建完成。"
 else
     build_target "$1"

build/functions/common.sh

@@ -244,6 +244,37 @@ download_file_if_missing() {
     return 1
 }
 
+# 下载 rc.local 文件
+download_rc_local() {
+    local platform_id="$1"
+    local rc_local_path="$SRCPATH/image/$platform_id/rc.local"
+    local relative_path="image/$platform_id/rc.local"
+    local remote_url="$REMOTE_PREFIX/$relative_path"
+
+    echo "信息：检查是否需要下载 rc.local 文件 ($platform_id)..."
+
+    # 如果本地文件不存在，尝试下载
+    if [ ! -f "$rc_local_path" ]; then
+        echo "信息：本地 rc.local 文件不存在，尝试从远程下载..."
+        ensure_dir "$(dirname "$rc_local_path")"
+
+        if curl -sSL --fail "$remote_url" -o "$rc_local_path"; then
+            echo "信息：成功下载 rc.local 文件：$remote_url"
+            # 在 GitHub Actions 环境中记录下载的文件
+            if is_github_actions; then
+                echo "$rc_local_path" >> "$DOWNLOADED_FILES_LIST"
+            fi
+            return 0
+        else
+            echo "信息：远程 rc.local 文件不存在或下载失败：$remote_url"
+            return 1
+        fi
+    else
+        echo "信息：使用本地 rc.local 文件：$rc_local_path"
+        return 0
+    fi
+}
+
 # 清理下载的文件（仅在 GitHub Actions 环境中）
 cleanup_downloaded_files() {
     if is_github_actions && [[ -f "$DOWNLOADED_FILES_LIST" ]]; then

build/functions/devices.sh

@@ -10,7 +10,7 @@ onecloud_rootfs() {
     local bootfs_sparse="$TMPDIR/6.boot.PARTITION.sparse"
     local rootfs_sparse="$TMPDIR/7.rootfs.PARTITION.sparse"
     local bootfs_loopdev="" # 存储 bootfs 使用的 loop 设备
-    local add_size_mb=400
+    local add_size_mb=600
 
     echo "信息：准备 Onecloud Rootfs..."
     ensure_dir "$TMPDIR"
@@ -66,9 +66,10 @@ onecloud_rootfs() {
 }
 
 cumebox2_rootfs() {
-    local source_image="$SRCPATH/image/cumebox2/Armbian_25.2.2_Khadas-vim1_bookworm_current_6.12.17_minimal.img"
+    local source_image="$SRCPATH/image/cumebox2/Armbian_24.8.1_Khadas-vim1_bookworm_current_6.6.47_minimal.img"
     local target_image="$TMPDIR/rootfs.img"
     local offset=$((8192 * 512))
+	local add_size_mb=900
 
     echo "信息：准备 Cumebox2 Rootfs..."
     ensure_dir "$TMPDIR"
@@ -77,7 +78,10 @@ cumebox2_rootfs() {
     download_file_if_missing "$source_image" || { echo "错误：下载 Cumebox2 原始镜像失败" >&2; exit 1; }
     
     cp "$source_image" "$target_image" || { echo "错误：复制 Cumebox2 原始镜像失败" >&2; exit 1; }
-
+	
+	echo "信息：扩展镜像文件 (${add_size_mb}MB)..."
+ 	sudo dd if=/dev/zero bs=1M count="$add_size_mb" >> "$target_image" || { echo "错误：扩展镜像文件失败" >&2; exit 1; }
+  
     echo "信息：调整镜像分区大小..."
     sudo parted -s "$target_image" resizepart 1 100% || { echo "错误：使用 parted 调整分区大小失败" >&2; exit 1; }
 
@@ -159,7 +163,7 @@ e900v22c_rootfs() {
     local source_image="$SRCPATH/image/e900v22c/Armbian_23.08.0_amlogic_s905l3a_bookworm_5.15.123_server_2023.08.01.img"
     local target_image="$TMPDIR/rootfs.img"
     local offset=$((532480 * 512))
-    local add_size_mb=400
+    local add_size_mb=600
 
     echo "信息：准备 E900V22C Rootfs..."
     ensure_dir "$TMPDIR"
@@ -188,11 +192,11 @@ e900v22c_rootfs() {
 }
 
 octopus_flanet_rootfs() {
-    local source_image="$SRCPATH/image/octopus-flanet/Armbian_24.11.0_amlogic_s912_bookworm_6.1.114_server_2024.11.01.img"
+    local source_image="$SRCPATH/image/octopus-flanet/Armbian_25.05.0_amlogic_s912_bookworm_6.1.129_server_2025.03.02.img"
     local target_image="$TMPDIR/rootfs.img"
     local boot_offset=$((8192 * 512))
     local rootfs_offset=$((1056768 * 512))
-    local add_size_mb=400
+    local add_size_mb=600
     local bootfs_loopdev=""
 
     echo "信息：准备 Octopus-Planet Rootfs..."
@@ -231,6 +235,71 @@ octopus_flanet_rootfs() {
     echo "信息：Octopus-Planet Rootfs 准备完成，loop 设备 $LOOPDEV 已就绪。"
 }
 
+onecloud_pro_rootfs() {
+    local source_image="$SRCPATH/image/onecloud-pro/Armbian-by-SilentWind_24.5.0_amlogic_Onecloud-Pro_jammy_6.6.28_server.img"
+    local target_image="$TMPDIR/rootfs.img"
+    local boot_offset=$((8192 * 512))
+    local rootfs_offset=$((1056768 * 512))
+    local add_size_mb=600
+    local bootfs_loopdev=""
+
+    echo "信息：准备 Octopus-Planet Rootfs..."
+    ensure_dir "$TMPDIR"; ensure_dir "$BOOTFS"
+    
+    # 自动下载源镜像文件（如果不存在）
+    download_file_if_missing "$source_image" || { echo "错误：下载 Octopus-Planet 原始镜像失败" >&2; exit 1; }
+    
+    cp "$source_image" "$target_image" || { echo "错误：复制 Octopus-Planet 原始镜像失败" >&2; exit 1; }
+
+    echo "信息：调整镜像分区大小 (分区 2)..."
+    sudo parted -s "$target_image" resizepart 2 100% || { echo "错误：使用 parted 调整分区 2 大小失败" >&2; exit 1; }
+
+    echo "信息：设置 rootfs 分区的 loop 设备..."
+    find_loop_device # 找 loop 给 rootfs
+    echo "信息：将 $target_image (偏移 $rootfs_offset) 关联到 $LOOPDEV..."
+    sudo losetup --offset "$rootfs_offset" "$LOOPDEV" "$target_image" || { echo "错误：设置 rootfs 分区 loop 设备 $LOOPDEV 失败" >&2; exit 1; }
+
+    echo "信息：检查并调整文件系统大小 (在 loop 设备上)..."
+    sudo e2fsck -f -y "$LOOPDEV" || { echo "警告：e2fsck 检查 $LOOPDEV 失败" >&2; exit 1; }
+    sudo resize2fs "$LOOPDEV" || { echo "错误：resize2fs 调整 $LOOPDEV 大小失败" >&2; exit 1; }
+
+    echo "信息：Octopus-Planet Rootfs 准备完成，loop 设备 $LOOPDEV 已就绪。"
+}
+
+orangepizero_rootfs() {
+    local source_image="$SRCPATH/image/orangepi-zero/Armbian_community_25.11.0-trunk.208_Orangepizero_bookworm_current_6.12.47_minimal.img"
+    local target_image="$TMPDIR/rootfs.img"
+    local offset=$((8192 * 512))
+    local add_size_mb=600
+
+    echo "信息：准备 Orange Pi Zero Rootfs..."
+    ensure_dir "$TMPDIR"
+
+    echo "信息：下载或使用本地 Orange Pi Zero 原始镜像..."
+    download_file_if_missing "$source_image" || { echo "错误：下载 Orange Pi Zero 原始镜像失败" >&2; exit 1; }
+
+    cp "$source_image" "$target_image" || { echo "错误：复制 Orange Pi Zero 原始镜像失败" >&2; exit 1; }
+
+    echo "信息：扩展镜像文件 (${add_size_mb}MB)..."
+    sudo dd if=/dev/zero bs=1M count="$add_size_mb" >> "$target_image" || { echo "错误：扩展镜像文件失败" >&2; exit 1; }
+
+    echo "信息：调整镜像分区大小..."
+    sudo parted -s "$target_image" resizepart 1 100% || { echo "错误：使用 parted 调整分区大小失败" >&2; exit 1; }
+
+    find_loop_device
+    sudo losetup -P "$LOOPDEV" "$target_image" || { echo "错误：设置 loop 设备失败" >&2; exit 1; }
+
+    echo "信息：检查并调整文件系统大小..."
+    sudo e2fsck -y -f "${LOOPDEV}p1" || { echo "错误：文件系统检查失败" >&2; exit 1; }
+    sudo resize2fs "${LOOPDEV}p1" || { echo "错误：调整文件系统大小失败" >&2; exit 1; }
+
+    # 重新设置 LOOPDEV 为分区
+    sudo losetup -d "$LOOPDEV"
+    sudo losetup "$LOOPDEV" "$target_image" -o "$offset" || { echo "错误：重新设置 loop 设备失败" >&2; exit 1; }
+
+    echo "信息：Orange Pi Zero Rootfs 准备完成。"
+}
+
 # --- 特定设备的文件配置函数 ---
 
 config_cumebox2_files() {
@@ -255,11 +324,114 @@ config_cumebox2_files() {
 
 config_octopus_flanet_files() {
     echo "信息：为 Octopus-Planet 配置特定文件 (model_database.conf)..."
-    
+
     # 自动下载 Octopus-Planet 相关文件（如果不存在）
     local config_file="$SRCPATH/image/octopus-flanet/model_database.conf"
-    
+
     download_file_if_missing "$config_file" || echo "警告：下载 Octopus-Planet 配置文件失败"
-    
+
     sudo cp "$config_file" "$ROOTFS/etc/model_database.conf" || echo "警告：复制 model_database.conf 失败"
-} 
+}
+
+config_orangepi_zero_files() {
+    echo "信息：配置 Orange Pi Zero 特定文件..."
+
+    # 清空 modules.conf 文件，避免加载不必要的模块
+    run_in_chroot "echo 'libcomposite' > /etc/modules-load.d/modules.conf"
+
+    echo "信息：Orange Pi Zero 特定配置完成。"
+}
+
+config_onecloud_pro_files() {
+    echo "信息：配置 Onecloud Pro 特定文件..."
+    echo "信息：Onecloud Pro 特定配置完成。"
+}
+
+config_onecloud_files() {
+    echo "信息：配置 Onecloud 特定文件..."
+    
+    # 在 ustreamer 命令中添加 DRM 设备配置
+    echo "信息：为 Onecloud 添加 DRM 设备支持..."
+    run_in_chroot "sed -i \"/--device=\\/dev\\/video0/a\\            - \\\"--drm-device /dev/dri/card1\\\"\" /etc/kvmd/override.yaml"
+    
+    echo "信息：Onecloud 特定配置完成。"
+}
+
+oec_turbo_rootfs() {
+    local source_image="$SRCPATH/image/oec-turbo/Flash_Armbian_25.05.0_rockchip_efused-wxy-oec_bookworm_6.1.99_server_2025.03.20.img"
+    local target_image="$TMPDIR/rootfs.img"
+    local rootfs_offset=$((1409024 * 512))  # 根据分区7的起始扇区计算
+
+    echo "信息：准备 OEC-Turbo Rootfs (Debian 12)..."
+    ensure_dir "$TMPDIR"
+
+    echo "信息：下载或使用本地 OEC-Turbo 原始镜像..."
+    download_file_if_missing "$source_image" || { echo "错误：下载 OEC-Turbo 原始镜像失败" >&2; exit 1; }
+
+    cp "$source_image" "$target_image" || { echo "错误：复制 OEC-Turbo 原始镜像失败" >&2; exit 1; }
+
+    find_loop_device
+    # 设置 loop 设备指向 rootfs 分区 (分区7)
+    sudo losetup "$LOOPDEV" "$target_image" -o "$rootfs_offset" || { echo "错误：设置 loop 设备失败" >&2; exit 1; }
+
+    echo "信息：OEC-Turbo Rootfs 准备完成，loop 设备 $LOOPDEV 已就绪。"
+}
+
+config_oec_turbo_files() {
+    echo "信息：配置 OEC-Turbo 特定文件..."
+
+    # 替换 override.yaml 中的硬件编码配置，启用 RK MPP 硬件编码
+    echo "信息：配置 VPU 硬件编码支持..."
+    run_in_chroot "sed -i 's/--h264-hwenc=disabled/--h264-hwenc=rkmpp/g' /etc/kvmd/override.yaml"
+
+    # 配置 rc.local 自启脚本，添加设备权限设置
+    echo "信息：配置 rc.local 自启脚本..."
+    run_in_chroot "cat > /etc/rc.local << 'EOF'
+#!/bin/bash
+chmod 777 /dev/mpp_service /dev/rga
+exit 0
+EOF"
+    run_in_chroot "chmod +x /etc/rc.local"
+
+    # 确保 rc-local.service 被启用，以便 kvmd 服务可以依赖它
+    echo "信息：启用 rc-local.service 服务..."
+    run_in_chroot "systemctl enable rc-local.service"
+
+    # 替换 DTB 文件
+    replace_oec_turbo_dtb
+
+    echo "信息：OEC-Turbo 特定配置完成。"
+}
+
+replace_oec_turbo_dtb() {
+    local dtb_source="$SRCPATH/image/oec-turbo/rk3566-onething-oec-box.dtb"
+    local target_image="$TMPDIR/rootfs.img"
+    local boot_offset=$((360448 * 512))  # boot 分区6的偏移
+    local boot_mount="$TMPDIR/oec_boot_mount"
+    local dtb_target_path="dtb/rockchip/rk3566-onething-oec-box.dtb"
+    local boot_loopdev=""
+
+    echo "信息：替换 OEC-Turbo DTB 文件..."
+
+    if [ ! -f "$dtb_source" ]; then
+        echo "信息：尝试下载 DTB 文件..."
+        download_file_if_missing "$dtb_source"
+    fi
+
+    echo "信息：为 boot 分区查找独立的 loop 设备..."
+    # 查找一个新的loop设备用于boot分区
+    boot_loopdev=$(losetup -f)
+    ensure_dir "$boot_mount"
+
+    losetup -o "$boot_offset" "$boot_loopdev" "$target_image"
+    mount "$boot_loopdev" "$boot_mount"
+
+    # 确保目标目录存在并复制 DTB 文件
+    mkdir -p "$boot_mount/$(dirname "$dtb_target_path")"
+    cp "$dtb_source" "$boot_mount/$dtb_target_path"
+    echo "信息：DTB 文件替换成功: $dtb_target_path"
+
+    umount "$boot_mount"
+    losetup -d "$boot_loopdev"
+    rmdir "$boot_mount"
+}

build/functions/install.sh

@@ -10,7 +10,7 @@ prepare_dns_and_mirrors() {
     && printf '%s\\n' 'nameserver 1.1.1.1' 'nameserver 1.0.0.1' > /etc/resolv.conf \\
     && echo '信息：尝试更换镜像源...' \\
     && bash <(curl -sSL https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh) \\
-        --source mirrors.tuna.tsinghua.edu.cn --upgrade-software false --web-protocol http || echo '警告：更换镜像源脚本执行失败，可能网络不通或脚本已更改'
+        --source mirrors.ustc.edu.cn --upgrade-software false --web-protocol http || echo '警告：更换镜像源脚本执行失败，可能网络不通或脚本已更改'
     "
 }
 
@@ -77,6 +77,8 @@ config_base_files() {
     sudo cp scripts/kvmd-gencert scripts/kvmd-bootconfig scripts/kvmd-certbot scripts/kvmd-udev-hdmiusb-check scripts/kvmd-udev-restart-pass build/scripts/kvmd-firstrun.sh "$ROOTFS/usr/bin/"
     sudo chmod +x "$ROOTFS/usr/bin/kvmd-gencert" "$ROOTFS/usr/bin/kvmd-bootconfig" "$ROOTFS/usr/bin/kvmd-certbot" "$ROOTFS/usr/bin/kvmd-udev-hdmiusb-check" "$ROOTFS/usr/bin/kvmd-udev-restart-pass" "$ROOTFS/usr/bin/kvmd-firstrun.sh"
     
+    # 尝试下载或使用本地 rc.local 文件
+    download_rc_local "$platform_id" || echo "信息：rc.local 文件不存在，跳过"
     if [ -f "$SRCPATH/image/$platform_id/rc.local" ]; then
         echo "信息：复制设备特定的 rc.local 文件..."
         sudo cp "$SRCPATH/image/$platform_id/rc.local" "$ROOTFS/etc/"
@@ -108,7 +110,7 @@ install_base_packages() {
         iptables network-manager curl kmod libmicrohttpd12 libjansson4 libssl3 \\
         libsofia-sip-ua0 libglib2.0-0 libopus0 libogg0 libcurl4 libconfig9 \\
         python3-pip net-tools libavcodec59 libavformat59 libavutil57 libswscale6 \\
-        libavfilter8 libavdevice59 v4l-utils libv4l-0 nano unzip && \\
+        libavfilter8 libavdevice59 v4l-utils libv4l-0 nano unzip dnsmasq python3-systemd && \\
     apt clean && \\
     rm -rf /var/lib/apt/lists/*
     "
@@ -119,9 +121,9 @@ configure_network() {
     if [ "$network_type" = "systemd-networkd" ]; then
         echo "信息：在 chroot 环境中配置 systemd-networkd..."
         
-        # 检查是否为onecloud平台，如果是则使用随机MAC地址生成机制
-        if [ "$TARGET_DEVICE_NAME" = "onecloud" ]; then
-            echo "信息：为onecloud平台配置随机MAC地址生成机制..."
+        # onecloud 与 onecloud-pro 均启用基于 SN 的 MAC 地址生成
+        if [ "$TARGET_DEVICE_NAME" = "onecloud" ] || [ "$TARGET_DEVICE_NAME" = "onecloud-pro" ]; then
+            echo "信息：为 ${TARGET_DEVICE_NAME} 平台配置基于 SN 的 MAC 地址生成机制..."
             
             # 复制MAC地址生成脚本
             sudo cp "$SCRIPT_DIR/scripts/generate-random-mac.sh" "$ROOTFS/usr/local/bin/"
@@ -138,7 +140,7 @@ configure_network() {
             systemctl enable systemd-networkd systemd-resolved && \\
             systemctl enable kvmd-generate-mac.service
             "
-            echo "信息：onecloud随机MAC地址生成机制配置完成"
+            echo "信息：${TARGET_DEVICE_NAME} 基于 SN 的 MAC 地址生成机制配置完成"
         fi
     else
         echo "信息：使用默认的网络管理器 (NetworkManager)..."
@@ -179,6 +181,7 @@ configure_system() {
     cat /One-KVM/configs/os/sudoers/v2-hdmiusb >> /etc/sudoers && \\
     cat /One-KVM/configs/os/udev/v2-hdmiusb-rpi4.rules > /etc/udev/rules.d/99-kvmd.rules && \\
     echo 'libcomposite' >> /etc/modules && \\
+    echo 'net.ipv4.ip_forward = 1' > /etc/sysctl.d/99-kvmd-extra.conf && \\
     mv /usr/local/bin/kvmd* /usr/bin/ || echo '信息：/usr/local/bin/kvmd* 未找到或移动失败，可能已在/usr/bin' && \\
     cp -r /One-KVM/configs/os/services/* /etc/systemd/system/ && \\
     cp /One-KVM/configs/os/tmpfiles.conf /usr/lib/tmpfiles.d/ && \\
@@ -191,8 +194,8 @@ configure_system() {
     sed -i 's/8080/80/g' /etc/kvmd/override.yaml && \\
     sed -i 's/4430/443/g' /etc/kvmd/override.yaml && \\
     chown kvmd -R /var/lib/kvmd/msd/ && \\
-    systemctl enable kvmd kvmd-otg kvmd-nginx kvmd-vnc kvmd-ipmi kvmd-webterm kvmd-janus kvmd-media && \\
-    systemctl disable nginx && \\
+    systemctl enable dnsmasq kvmd kvmd-otg kvmd-nginx kvmd-vnc kvmd-ipmi kvmd-webterm kvmd-janus kvmd-media kvmd-gostc && \\
+    systemctl disable nginx systemd-resolved && \\
     rm -rf /One-KVM
     "
 }
@@ -218,6 +221,54 @@ install_webterm() {
     "
 }
 
+install_gostc() {
+    local arch="$1" # armhf, aarch64, x86_64
+    local gostc_arch="$arch"
+    local gostc_version="v2.0.8-beta.2"
+    
+    # 根据架构映射下载文件名
+    case "$arch" in
+        armhf) gostc_arch="arm_7" ;;
+        aarch64) gostc_arch="arm64_v8.0" ;;
+        x86_64|amd64) gostc_arch="amd64_v1" ;;
+        *) echo "错误：不支持的架构 $arch"; exit 1 ;;
+    esac
+    
+    echo "信息：在 chroot 环境中下载并安装 gostc ($gostc_arch)..."
+    run_in_chroot "
+    mkdir -p /tmp/gostc && cd /tmp/gostc && \\
+    curl -L https://github.com/mofeng-git/gostc-open/releases/download/${gostc_version}/gostc_linux_${gostc_arch}.tar.gz -o gostc.tar.gz && \\
+    tar -xzf gostc.tar.gz && \\
+    mv gostc /usr/bin/ && \\
+    chmod +x /usr/bin/gostc && \\
+    cd / && rm -rf /tmp/gostc
+    "
+    
+    echo "信息：创建 gostc systemd 服务文件..."
+    run_in_chroot "
+    cat > /etc/systemd/system/kvmd-gostc.service << 'EOF'
+[Unit]
+Description=基于FRP开发的内网穿透 客户端/节点
+ConditionFileIsExecutable=/usr/bin/gostc
+After=network.target
+
+[Service]
+StartLimitInterval=5
+StartLimitBurst=10
+ExecStart=/usr/bin/gostc \"-web-addr\" \"0.0.0.0:18080\"
+WorkingDirectory=/usr/bin
+Restart=always
+RestartSec=10
+EnvironmentFile=-/etc/sysconfig/gostc
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    "
+    
+    echo "信息：gostc 安装和配置完成"
+}
+
 apply_kvmd_tweaks() {
     local arch="$1" # armhf, aarch64, x86_64
     local device_type="$2" # "gpio" or "video1" or other
@@ -246,7 +297,15 @@ apply_kvmd_tweaks() {
 
 
         # 根据 device_type 配置 ATX
-        if [ "$device_type" = "gpio" ]; then
+        if [[ "$device_type" == *"gpio-onecloud-pro"* ]]; then
+            echo "信息：电源控制设备类型为 gpio，设置 ATX 为 GPIO 并配置引脚..."
+            atx_setting="GPIO"
+             run_in_chroot "
+             sed -i 's/^ATX=.*/ATX=GPIO/' /etc/kvmd/atx.sh && \\
+             sed -i 's/SHUTDOWNPIN/gpiochip0 7/g' /etc/kvmd/custom_atx/gpio.sh && \\
+             sed -i 's/REBOOTPIN/gpiochip0 11/g' /etc/kvmd/custom_atx/gpio.sh
+             "
+        elif [[ "$device_type" == *"gpio-onecloud"* ]]; then
             echo "信息：电源控制设备类型为 gpio，设置 ATX 为 GPIO 并配置引脚..."
             atx_setting="GPIO"
              run_in_chroot "
@@ -261,10 +320,10 @@ apply_kvmd_tweaks() {
         fi
 
         # 配置视频设备
-        if [ "$device_type" = "video1" ]; then
+        if [[ "$device_type" == *"video1"* ]]; then
             echo "信息：视频设备类型为 video1，设置视频设备为 /dev/video1..."
             run_in_chroot "sed -i 's|/dev/video0|/dev/video1|g' /etc/kvmd/override.yaml"
-        elif [ "$device_type" = "kvmd-video" ]; then
+        elif [[ "$device_type" == *"video1"* ]]; then
             echo "信息：视频设备类型为 kvmd-video，设置视频设备为 /dev/kvmd-video..."
             run_in_chroot "sed -i 's|/dev/video0|/dev/kvmd-video|g' /etc/kvmd/override.yaml"
         else
@@ -294,9 +353,11 @@ install_and_configure_kvmd() {
     config_base_files "$TARGET_DEVICE_NAME" # 使用全局变量传递设备名
 
     # 特定设备的额外文件配置 (如果存在)
-    if declare -f "config_${TARGET_DEVICE_NAME}_files" > /dev/null; then
-        echo "信息：执行特定设备的文件配置函数 config_${TARGET_DEVICE_NAME}_files ..."
-        "config_${TARGET_DEVICE_NAME}_files"
+    # 将设备名中的连字符转换为下划线以匹配函数名
+    local device_func_name="${TARGET_DEVICE_NAME//-/_}"
+    if declare -f "config_${device_func_name}_files" > /dev/null; then
+        echo "信息：执行特定设备的文件配置函数 config_${device_func_name}_files ..."
+        "config_${device_func_name}_files"
     fi
 
     # 某些镜像可能需要准备DNS和换源
@@ -311,6 +372,7 @@ install_and_configure_kvmd() {
     configure_network "$network_type"
     install_python_deps
     configure_kvmd_core
+    install_gostc "$arch" # 安装 gostc
     configure_system
     install_webterm "$arch" # 传递原始架构名给ttyd下载
     apply_kvmd_tweaks "$arch" "$device_type"

build/platform/oec-turbo

@@ -0,0 +1,3 @@
+PIKVM_MODEL=v2_model
+PIKVM_VIDEO=usb_video
+PIKVM_BOARD=oec-turbo

build/platform/onecloud-pro

@@ -0,0 +1,3 @@
+PIKVM_MODEL=v2_model
+PIKVM_VIDEO=usb_video
+PIKVM_BOARD=onecloud-pro

build/platform/orangepi-zero

@@ -0,0 +1,3 @@
+PIKVM_MODEL=v2_model
+PIKVM_VIDEO=usb_video
+PIKVM_BOARD=orangepi-zero

build/scripts/generate-random-mac.sh

@@ -1,12 +1,45 @@
 #!/bin/bash
 
-# 为onecloud平台生成随机MAC地址的一次性脚本
-# 此脚本在首次开机时执行，为eth0网卡生成并应用随机MAC地址
+# 为玩客云/玩客云Pro 平台生成 MAC 地址的一次性脚本
+# 此脚本在首次开机时执行，为 eth0 网卡生成并应用基于 SN 的 MAC 地址，失败时回退到随机 MAC
 
 set -e
 
 NETWORK_CONFIG="/etc/systemd/network/99-eth0.network"
 LOCK_FILE="/var/lib/kvmd/.mac-generated"
+PLATFORM_FILE="/usr/share/kvmd/platform"
+EFUSE_SYSFS_PATH=""
+SN_PREFIX=""
+SN_EXPECTED_LENGTH=13
+
+# 按平台设置 EFUSE 与 SN 参数；未知平台时按 efuse 路径探测
+detect_platform_params() {
+    local platform=""
+    if [ -f "$PLATFORM_FILE" ]; then
+        platform=$(tr -d '\n' < "$PLATFORM_FILE")
+    fi
+
+    case "$platform" in
+        onecloud)
+            EFUSE_SYSFS_PATH="/sys/bus/nvmem/devices/meson8b-efuse0/nvmem"
+            SN_PREFIX="OCP"
+            ;;
+        onecloud-pro)
+            EFUSE_SYSFS_PATH="/sys/devices/platform/efuse/efuse0/nvmem"
+            SN_PREFIX="ODC"
+            ;;
+    esac
+
+    if [ -z "$EFUSE_SYSFS_PATH" ] || [ -z "$SN_PREFIX" ]; then
+        if [ -e "/sys/devices/platform/efuse/efuse0/nvmem" ]; then
+            EFUSE_SYSFS_PATH="/sys/devices/platform/efuse/efuse0/nvmem"
+            SN_PREFIX="ODC"
+        elif [ -e "/sys/bus/nvmem/devices/meson8b-efuse0/nvmem" ]; then
+            EFUSE_SYSFS_PATH="/sys/bus/nvmem/devices/meson8b-efuse0/nvmem"
+            SN_PREFIX="OCP"
+        fi
+    fi
+}
 
 # 检查是否已经执行过
 if [ -f "$LOCK_FILE" ]; then
@@ -14,10 +47,29 @@ if [ -f "$LOCK_FILE" ]; then
     exit 0
 fi
 
-# 生成随机MAC地址 (使用本地管理的MAC地址前缀)
+# 生成MAC地址函数
 generate_random_mac() {
-    # 使用本地管理的MAC地址前缀 (第二位设为2、6、A、E中的一个)
-    # 这样可以避免与真实硬件MAC地址冲突
+    detect_platform_params
+    # 尝试根据 SN 生成唯一 MAC 地址
+    if [ -f "$EFUSE_SYSFS_PATH" ]; then
+        sn_offset=$(grep --binary-files=text -boP "$SN_PREFIX" "$EFUSE_SYSFS_PATH" | head -n1 | cut -d: -f1)
+        if [ -n "$sn_offset" ]; then
+            sn=$(cat "$EFUSE_SYSFS_PATH" | dd bs=1 skip="$sn_offset" count="$SN_EXPECTED_LENGTH" 2>/dev/null)
+            if [ ${#sn} -eq $SN_EXPECTED_LENGTH ]; then
+                echo "S/N: $sn" >&2  # 输出到 stderr，避免干扰返回值
+                # 使用 SN 的 SHA-256 哈希生成后 5 字节（避免多余管道）
+                sn_hash=$(printf %s "$sn" | sha256sum | cut -d' ' -f1)
+                # 直接用 Bash 子串获取哈希末 10 个字符并插入分隔符
+                mac_hex=${sn_hash: -10}
+                mac_suffix=$(printf "%s:%s:%s:%s:%s" "${mac_hex:0:2}" "${mac_hex:2:2}" "${mac_hex:4:2}" "${mac_hex:6:2}" "${mac_hex:8:2}")
+                printf "02:%s\n" "$mac_suffix"
+                return 0
+            fi
+        fi
+    fi
+
+    # 若 SN 获取失败，回退到随机逻辑
+    echo "警告: 无法获取 SN，回退到随机 MAC 生成" >&2
     printf "02:%02x:%02x:%02x:%02x:%02x\n" \
         $((RANDOM % 256)) \
         $((RANDOM % 256)) \
@@ -26,12 +78,18 @@ generate_random_mac() {
         $((RANDOM % 256))
 }
 
-echo "正在为onecloud生成随机MAC地址..."
+echo "正在生成基于 SN 的 MAC 地址..."
 
 # 生成新的MAC地址
 NEW_MAC=$(generate_random_mac)
 echo "生成的MAC地址: $NEW_MAC"
 
+# 验证 MAC 地址格式
+if ! [[ $NEW_MAC =~ ^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$ ]]; then
+    echo "错误: 生成的 MAC 地址格式无效: $NEW_MAC"
+    exit 1
+fi
+
 # 备份原配置文件
 if [ -f "$NETWORK_CONFIG" ]; then
     cp "$NETWORK_CONFIG" "${NETWORK_CONFIG}.backup"
@@ -58,7 +116,7 @@ echo "MAC地址生成时间: $(date)" > "$LOCK_FILE"
 # 禁用此服务，确保只运行一次
 systemctl disable kvmd-generate-mac.service
 
-echo "随机MAC地址生成完成: $NEW_MAC"
+echo "MAC地址生成完成: $NEW_MAC"
 echo "服务已自动禁用，下次开机不会再执行"
 
-exit 0 
+exit 0

configs/janus/janus.plugin.ustreamer.jcfg

@@ -2,6 +2,6 @@ video: {
 	sink = "kvmd::ustreamer::h264"
 }
 acap: {
-     device = "hw:0"
+     device = "hw:0,0"
      tc358743 = "/dev/video0"
 }

configs/kvmd/atx.sh

@@ -20,6 +20,7 @@
 #                                                                            #
 # ========================================================================== #
 
+ATX=USBRELAY_HID
 echo $ATX
 case $ATX in
     GPIO)
@@ -31,4 +32,4 @@ case $ATX in
     *)
     echo "No thing."
     exit -1
-esac
+esac

configs/kvmd/supervisord.conf

@@ -53,6 +53,17 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes = 0
 redirect_stderr=true
 
+[program:kvmd-gostc]
+command=/usr/bin/gostc -web-addr 0.0.0.0:18080
+autostart=true
+autorestart=true
+startsecs=5
+priority=300
+stopasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes = 0
+redirect_stderr=true
+
 [program:clean_when_exit]
 command=/etc/kvmd/clean_when_exit.sh
 autostart=true

configs/os/services/kvmd.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=One-KVM - The main daemon
-After=network.target network-online.target nss-lookup.target
+After=network.target network-online.target nss-lookup.target rc-local.service
 
 [Service]
 User=kvmd

configs/os/udev/v2-hdmiusb-rpi4.rules

@@ -4,3 +4,4 @@ KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", PROGRAM="/usr/bin/kvmd-udev-hdm
 KERNEL=="hidg0", GROUP="kvmd", SYMLINK+="kvmd-hid-keyboard"
 KERNEL=="hidg1", GROUP="kvmd", SYMLINK+="kvmd-hid-mouse"
 KERNEL=="hidg2", GROUP="kvmd", SYMLINK+="kvmd-hid-mouse-alt"
+KERNEL=="ttyUSB0", GROUP="kvmd", SYMLINK+="kvmd-hid"

extras/gostc/manifest.yaml

@@ -0,0 +1,6 @@
+name: GOSTC
+description: GOSTC Server
+icon: share/svg/gostc.svg
+path: extras/gostc
+daemon: kvmd-gostc
+place: 11

extras/gostc/nginx.ctx-server.conf

@@ -0,0 +1,7 @@
+location /extras/gostc {
+	proxy_pass http://127.0.0.1:18080;
+	include /etc/kvmd/nginx/loc-proxy.conf;
+	include /etc/kvmd/nginx/loc-websocket.conf;
+	include /etc/kvmd/nginx/loc-login.conf;
+	include /etc/kvmd/nginx/loc-nocache.conf;
+}