From 1e727ddc1b2c9b3d635f85c50dc1ce5c223acdbc Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Sun, 12 Oct 2025 17:15:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2=20Octopus-Planet=20dt?= =?UTF-8?q?b=20=E4=BF=AE=E5=A4=8D=20OTG=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/functions/devices.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/functions/devices.sh b/build/functions/devices.sh index dbb694b2..ede2200f 100755 --- a/build/functions/devices.sh +++ b/build/functions/devices.sh @@ -214,6 +214,12 @@ octopus_flanet_rootfs() { sudo losetup --offset "$boot_offset" "$bootfs_loopdev" "$target_image" || { echo "错误：设置 boot 分区 loop 设备 $bootfs_loopdev 失败" >&2; exit 1; } sudo mount "$bootfs_loopdev" "$BOOTFS" || { echo "错误：挂载 boot 分区 ($bootfs_loopdev) 失败" >&2; exit 1; } BOOTFS_MOUNTED=1 + + # 自动下载 Octopus-Planet 相关文件 + local dtb_file="$SRCPATH/image/octopus-flanet/meson-gxm-octopus-planet.dtb" + download_file_if_missing "$dtb_file" || echo "警告：下载 Octopus-Planet DTB 失败" + sudo cp "$dtb_file" "$BOOTFS/dtb/amlogic/meson-gxm-octopus-planet.dtb" || echo "警告：复制 Octopus-Planet DTB 失败" + sudo sed -i "s/meson-gxm-octopus-planet.dtb/meson-gxm-khadas-vim2.dtb/g" "$BOOTFS/uEnv.txt" || { echo "错误：修改 uEnv.txt 失败" >&2; exit 1; } sudo umount "$BOOTFS" || { echo "警告：卸载 boot 分区 ($BOOTFS) 失败" >&2; BOOTFS_MOUNTED=0; } BOOTFS_MOUNTED=0 @@ -314,8 +320,7 @@ config_cumebox2_files() { download_file_if_missing "$dtb_file" || echo "警告：下载 Cumebox2 DTB 失败" download_file_if_missing "$ssd_file" || echo "警告：下载 Cumebox2 ssd 脚本失败" download_file_if_missing "$config_file" || echo "警告：下载 Cumebox2 配置文件失败" - - # 注意 DTB 路径可能需要根据实际 Armbian 版本调整 + sudo cp "$dtb_file" "$ROOTFS/boot/dtb/amlogic/meson-gxl-s905x-khadas-vim.dtb" || echo "警告：复制 Cumebox2 DTB 失败" sudo cp "$ssd_file" "$ROOTFS/usr/bin/" || echo "警告：复制 Cumebox2 ssd 脚本失败" sudo chmod +x "$ROOTFS/usr/bin/ssd" || echo "警告：设置 ssd 脚本执行权限失败"