From 52c85a1146073338e6e8b96dff40b13cab409f52 Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 15:50:51 +0800 Subject: [PATCH 1/4] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2932a7d..3bd127e 100644 --- a/build.sh +++ b/build.sh @@ -406,7 +406,7 @@ download_prebuilt_toolchain() { fi echo -e "${BLUE_COLOR}├─ 下载工具链文件...${RESET}" - local TOOLCHAIN_URL="https://github.com/QuickWrt/QuickWrt/releases/download/openwrt-24.10" + local TOOLCHAIN_URL="https://github.com/QuickWrt/ZeroWrt/releases/download/Toolchain-Cache" local toolchain_file="toolchain_musl_${TOOLCHAIN_ARCH}_gcc-13.tar.zst" if curl -L "${TOOLCHAIN_URL}/${toolchain_file}" -o toolchain.tar.zst ${CURL_OPTIONS}; then From 91cc262d0c0f2e00d4d4c8c220776b7bf1d414ec Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 15:59:44 +0800 Subject: [PATCH 2/4] Update build.sh --- build.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 3bd127e..d6ca4cb 100644 --- a/build.sh +++ b/build.sh @@ -556,14 +556,13 @@ 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" + process_x86_64 elif [ "$architecture" = "rockchip" ]; then - process_rockchip "$version" + process_rockchip else print_warning "未知架构: $architecture，跳过打包和OTA生成" fi @@ -573,7 +572,6 @@ package_and_generate_ota() { # 处理 x86_64 架构 process_x86_64() { - local version="$1" print_info "处理 x86_64 架构的打包..." @@ -612,7 +610,6 @@ process_x86_64() { # 生成 x86_64 OTA JSON generate_x86_64_ota_json() { - local version="$1" print_info "生成 x86_64 OTA JSON 文件..." @@ -621,7 +618,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 "$$tag_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}" @@ -647,7 +644,6 @@ EOF # 处理 rockchip 架构 process_rockchip() { - local version="$1" print_info "处理 rockchip 架构的打包..." @@ -686,7 +682,6 @@ process_rockchip() { # 生成 rockchip OTA JSON generate_rockchip_ota_json() { - local version="$1" print_info "生成 rockchip OTA JSON 文件..." @@ -695,7 +690,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 "$$tag_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}') @@ -940,7 +935,7 @@ main() { if [[ "$BUILD_MODE" != "toolchain-only" ]]; then setup_kmod_package_name - package_and_generate_ota "$architecture" "$version" + package_and_generate_ota "$architecture" fi # 计算总耗时 From d96e765ebd45794b575ace199c389b964dbf2318 Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 15:59:59 +0800 Subject: [PATCH 3/4] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5beeb4d..7cf9a55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: run: | latest_tag=$(git tag --list "v*" | sort -V | tail -n1) if [ -z "$latest_tag" ]; then - next_tag="v2.0" + next_tag="v3.0" else base=${latest_tag#v} major=$(echo $base | cut -d. -f1) From 9f049cf2ca76316a767658dd09a77e19cc0c7e41 Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Fri, 24 Oct 2025 16:00:12 +0800 Subject: [PATCH 4/4] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index d6ca4cb..d4373e2 100644 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ readonly RESET='\033[0m' # 全局常量定义 # ============================================================================= readonly SCRIPT_NAME="OpenWRT 构建系统" -readonly SCRIPT_VERSION="2.0.0" +readonly SCRIPT_VERSION="2.0.1" readonly AUTHOR="OPPEN321" readonly BLOG="www.kejizero.online" readonly MIRROR="https://raw.githubusercontent.com/QuickWrt/QuickWrt/refs/heads/master"