From 52464bde483f8d3b2a323b01e8aceff919b0df9b Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 09:03:49 +0800 Subject: [PATCH 1/3] Update build.sh --- build.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index c9bc7f1..61a3bb2 100644 --- a/build.sh +++ b/build.sh @@ -555,14 +555,17 @@ setup_kmod_package_name() { # 打包和生成OTA文件 package_and_generate_ota() { + local architecture="$1" + local version="$2" + print_info "开始打包和生成OTA文件..." - if [ "$ARCHITECTURE" = "x86_64" ]; then - process_x86_64 "$VERSION" - elif [ "$ARCHITECTURE" = "rockchip" ]; then - process_rockchip "$VERSION" + if [ "$architecture" = "x86_64" ]; then + process_x86_64 "$version" + elif [ "$architecture" = "rockchip" ]; then + process_rockchip "$version" else - print_warning "未知架构: $ARCHITECTURE，跳过打包和OTA生成" + print_warning "未知架构: $architecture，跳过打包和OTA生成" fi print_success "打包和OTA生成完成" @@ -618,7 +621,7 @@ generate_x86_64_ota_json() { echo -e "${BLUE_COLOR}├─ 计算 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$VERSION" | sed 's/v//g') + local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') # 修复：使用 $version 而不是 $VERSION local SHA256=$(sha256sum bin/targets/x86/64*/*-generic-squashfs-combined-efi.img.gz | awk '{print $1}') echo -e "${BLUE_COLOR}├─ 生成 JSON 文件...${RESET}" @@ -692,7 +695,7 @@ generate_rockchip_ota_json() { echo -e "${BLUE_COLOR}├─ 计算各设备的 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$VERSION" | sed 's/v//g') + local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') # 修复：使用 $version 而不是 $VERSION # 计算各个设备的SHA256 local SHA256_armsom_sige3=$(sha256sum bin/targets/rockchip/armv8*/zerowrt-$VERSION_NUMBER-rockchip-armv8-armsom_sige3-squashfs-sysupgrade.img.gz | awk '{print $1}') @@ -937,7 +940,7 @@ main() { if [[ "$BUILD_MODE" != "toolchain-only" ]]; then setup_kmod_package_name - package_and_generate_ota + package_and_generate_ota "$architecture" "$version" fi # 计算总耗时 From 1c5cafa86304e8f87438837ab08f74cf0c5a5558 Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 09:07:51 +0800 Subject: [PATCH 2/3] Update build.sh --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 61a3bb2..2932a7d 100644 --- a/build.sh +++ b/build.sh @@ -621,7 +621,7 @@ generate_x86_64_ota_json() { echo -e "${BLUE_COLOR}├─ 计算 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') # 修复：使用 $version 而不是 $VERSION + local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') local SHA256=$(sha256sum bin/targets/x86/64*/*-generic-squashfs-combined-efi.img.gz | awk '{print $1}') echo -e "${BLUE_COLOR}├─ 生成 JSON 文件...${RESET}" @@ -695,7 +695,7 @@ generate_rockchip_ota_json() { echo -e "${BLUE_COLOR}├─ 计算各设备的 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') # 修复：使用 $version 而不是 $VERSION + local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') # 计算各个设备的SHA256 local SHA256_armsom_sige3=$(sha256sum bin/targets/rockchip/armv8*/zerowrt-$VERSION_NUMBER-rockchip-armv8-armsom_sige3-squashfs-sysupgrade.img.gz | awk '{print $1}') From 4c42e4423ff7178bf52078502c388ea96a8e000e Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 09:14:49 +0800 Subject: [PATCH 3/3] Update build.sh