From 33da56dead863a77e6c430a287a774f905fcd748 Mon Sep 17 00:00:00 2001
From: Del Wang <wjg12341234@163.com>
Date: Fri, 2 Jan 2026 12:50:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20runtime=20=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/runtime/Dockerfile | 69 ++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/packages/runtime/Dockerfile b/packages/runtime/Dockerfile
index dcf28f3..13cd6bf 100644
--- a/packages/runtime/Dockerfile
+++ b/packages/runtime/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
-FROM ubuntu:20.04
+FROM --platform=linux/amd64 ubuntu:20.04
 
-# 1. 环境变量合并，减少层数
+# 1. 环境变量
 ENV DEBIAN_FRONTEND=noninteractive \
     PATH="/opt/toolchain/bin:/root/.cargo/bin:${PATH}" \
     PKG_CONFIG_ALLOW_CROSS=1 \
@@ -10,8 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CC_armv7_unknown_linux_gnueabihf="arm-linux-gnueabihf-gcc --sysroot=/opt/sysroot"
 
-# 2. 基础依赖与多架构源配置合并
-# 使用 --mount=type=cache 优化 apt 操作
+# 2. 基础依赖与多架构源
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list && \
@@ -26,8 +25,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     # 删除 lists 文件以减小体积
     rm -rf /var/lib/apt/lists/*
 
-# 3. 安装 Linaro Toolchain & Rust
-# 将下载和清理放在一层，减少体积
+# 3. 工具链
 RUN mkdir -p /opt/toolchain && \
     curl -fSL https://releases.linaro.org/components/toolchain/binaries/latest-7/arm-linux-gnueabihf/gcc-linaro-7.5.0-2019.12-x86_64_arm-linux-gnueabihf.tar.xz | tar -xJ -C /opt/toolchain --strip-components=1 && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable && \
@@ -35,48 +33,49 @@ RUN mkdir -p /opt/toolchain && \
 
 WORKDIR /app
 
-# 4. 脚本与 Rootfs 处理
-# 使用 --mount=bind 减少一次 COPY 导致的镜像体积增加
+# 4. 脚本与 Rootfs
 COPY run.sh runtime.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/run.sh /usr/local/bin/runtime.sh
 
-# 处理 root.squashfs：利用临时挂载或直接解压并删除
+# --------------------------------------------------------------------------------
+# 5. 构建混合 Sysroot
+# 目标：结合 OpenWrt 的运行时库 (root.squashfs) 和 Toolchain/Ubuntu 的开发文件
+# --------------------------------------------------------------------------------
 RUN --mount=type=bind,source=root.squashfs,target=/app/root.squashfs \
-    mkdir -p /opt/sysroot && unsquashfs -d /opt/sysroot -f /app/root.squashfs
-
-# 5. 构建混合 Sysroot 逻辑优化
-# 将所有文件操作合并到一个 RUN 块，减少 Metadata 冗余
-RUN set -e; \
-    # 1. 自动为共享库创建 .so 软链接
-    find /opt/sysroot/lib /opt/sysroot/usr/lib -name "lib*.so.*" | while read -r src; do \
+    set -ex; \
+    # 1. 解压缩并创建基础目录
+    mkdir -p /opt/sysroot && unsquashfs -d /opt/sysroot -f /app/root.squashfs; \
+    mkdir -p /opt/sysroot/usr/lib/pkgconfig /opt/sysroot/usr/include /opt/sysroot/lib; \
+    \
+    # 2. 补全启动文件和 nonshared 库 
+    TC_LIBC_DIR="/opt/toolchain/arm-linux-gnueabihf/libc"; \
+    if [ -d "$TC_LIBC_DIR" ]; then \
+        find "$TC_LIBC_DIR/usr/lib" -name "*crt*.o" -exec cp -t /opt/sysroot/usr/lib/ {} +; \
+        find "$TC_LIBC_DIR/usr/lib" \( -name "libc_nonshared.a" -o -name "libpthread_nonshared.a" \) \
+            -exec cp -t /opt/sysroot/usr/lib/ {} +; \
+    fi; \
+    \
+    # 3. 自动修复所有 .so 软链接
+    find /opt/sysroot/lib /opt/sysroot/usr/lib -name "lib*.so.*" | while read src; do \
         link_name=$(echo "$src" | sed 's/\.so\..*$/.so/'); \
         if [ ! -e "$link_name" ]; then \
             ln -s "$(basename "$src")" "$link_name"; \
-        fi; \
+        fi \
     done; \
-    # 2. 拷贝 crt*.o 文件
-    find /opt/toolchain/arm-linux-gnueabihf/libc -name "*crt*.o" -exec cp {} /opt/sysroot/usr/lib/ \; ; \
-    # 3. 拷贝 libc_nonshared.a
-    cp /opt/toolchain/arm-linux-gnueabihf/libc/usr/lib/libc_nonshared.a /opt/sysroot/usr/lib/; \
-    if [ -f /opt/toolchain/arm-linux-gnueabihf/libc/usr/lib/libpthread_nonshared.a ]; then \
-        cp /opt/toolchain/arm-linux-gnueabihf/libc/usr/lib/libpthread_nonshared.a /opt/sysroot/usr/lib/; \
-    fi; \
-    # 4. 生成 Linker Scripts
+    \
+    # 4. 生成 libc.so Linker Script
+    rm -f /opt/sysroot/usr/lib/libc.so; \
     printf "OUTPUT_FORMAT(elf32-littlearm)\nGROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )\n" > /opt/sysroot/usr/lib/libc.so; \
-    if [ -f /opt/sysroot/lib/libpthread.so.0 ]; then \
-        printf "OUTPUT_FORMAT(elf32-littlearm)\nGROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )\n" > /opt/sysroot/usr/lib/libpthread.so; \
+    \
+    # 5. 注入 Ubuntu 的开发头文件和 PC 文件
+    if [ -d /usr/lib/arm-linux-gnueabihf/pkgconfig ]; then \
+        find /usr/lib/arm-linux-gnueabihf/pkgconfig/ -name "*.pc" -exec cp -t /opt/sysroot/usr/lib/pkgconfig/ {} +; \
     fi; \
-    # 5. 注入头文件和 pkgconfig
     cp -r /usr/include/alsa /opt/sysroot/usr/include/ 2>/dev/null || true; \
     cp -r /usr/include/opus /opt/sysroot/usr/include/ 2>/dev/null || true; \
-    if [ -d /usr/include/arm-linux-gnueabihf ]; then \
-        cp -r /usr/include/arm-linux-gnueabihf/* /opt/sysroot/usr/include/ 2>/dev/null || true; \
-    fi; \
-    if [ -d /usr/lib/arm-linux-gnueabihf/pkgconfig ]; then \
-        cp -r /usr/lib/arm-linux-gnueabihf/pkgconfig/* /opt/sysroot/usr/lib/pkgconfig/ 2>/dev/null || true; \
-    fi
+    [ -d /usr/include/arm-linux-gnueabihf ] && cp -r /usr/include/arm-linux-gnueabihf/* /opt/sysroot/usr/include/ 2>/dev/null || true
 
-# 6. 设置 Rust 链接参数
+# 6. Rust 编译参数
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS="\
     -C link-arg=--sysroot=/opt/sysroot \
     -C link-arg=-Wl,-dynamic-linker,/lib/ld-linux-armhf.so.3 \