Add auto retry when wget fail

.github/workflows/AutoBuild-asus_rt-acrh17.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-d-team_newifi-d2.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-p2w_r619ac-128m.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-x86_64.yml

@@ -215,7 +215,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/AutoBuild-xiaoyu_xy-c5.yml

@@ -216,7 +216,7 @@ jobs:
     - name: Download Github API
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload Github API to Release
       if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()

.github/workflows/Module-Refresh_API.yml

@@ -30,7 +30,7 @@ jobs:
 
     - name: Download Github Release API
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         
     - name: Upload API to Github Release
       uses: svenstaro/upload-release-action@v2

.github/workflows/X-x86_64_Test.yml

@@ -136,7 +136,6 @@ jobs:
         sudo chown $USER:$GROUPS /workdir
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
         then
-            docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
             sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
             sudo -E apt-get -y autoremove --purge
             sudo -E apt-get clean
@@ -221,7 +220,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}

.github/workflows/X-x86_64_X.yml

@@ -26,6 +26,9 @@ on:
       Tempoary_FLAG:
         description: '固件名称后缀 [可选]'
         default: 'X'
+      Tempoary_Remove_AMDGPU:
+        description: '是否移除AMD GPU驱动'
+        default: 'true'
 ### 结束
 
   #push:
@@ -68,6 +71,7 @@ jobs:
         echo "::set-output name=date::$(date +'%Y-%m-%d')"
         echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
         echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV
+        echo "Tempoary_Remove_AMDGPU=${{ github.event.inputs.Tempoary_Remove_AMDGPU }}" >> $GITHUB_ENV
         echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
         echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
@@ -178,9 +182,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -198,6 +202,10 @@ jobs:
         make defconfig
         Firmware_Diy_Before
         rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
+        if [ "${{ env.Tempoary_Remove_AMDGPU }}" == true ]
+        then
+          echo "# CONFIG_PACKAGE_kmod-drm-amdgpu is not set" >> .config
+        fi
         Firmware_Diy_Main
         Firmware_Diy
         Firmware_Diy_Other
@@ -273,7 +281,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}

.github/workflows/X-x86_64_X_Mine.yml

@@ -26,6 +26,9 @@ on:
       Tempoary_FLAG:
         description: '固件名称后缀 [可选]'
         default: 'X'
+      Tempoary_Remove_AMDGPU:
+        description: '是否移除AMD GPU驱动'
+        default: 'true'
 ### 结束
 
   #push:
@@ -74,6 +77,7 @@ jobs:
         echo "::set-output name=date::$(date +'%Y-%m-%d')"
         echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
         echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV
+        echo "Tempoary_Remove_AMDGPU=${{ github.event.inputs.Tempoary_Remove_AMDGPU }}" >> $GITHUB_ENV
         echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
         echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
         
@@ -168,9 +172,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -188,6 +192,10 @@ jobs:
         make defconfig
         Firmware_Diy_Before
         rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
+        if [ "${{ env.Tempoary_Remove_AMDGPU }}" == true ]
+        then
+          echo "# CONFIG_PACKAGE_kmod-drm-amdgpu is not set" >> .config
+        fi
         Firmware_Diy_Main
         Firmware_Diy
         Firmware_Diy_Other
@@ -264,7 +272,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}

.github/workflows/X-x86_64_Y.yml

@@ -175,9 +175,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -268,7 +268,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}

.github/workflows/X-x86_64_Z.yml

@@ -146,7 +146,6 @@ jobs:
         sudo chown $USER:$GROUPS /workdir
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
         then
-          docker images
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
           sudo -E apt-get -y autoremove --purge
           sudo -E apt-get clean
@@ -173,9 +172,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -247,7 +246,6 @@ jobs:
         cd openwrt
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
         Firmware_Diy_End
-        ls bin/Firmware
 
     - name: Upload Firmware to Artifacts
       uses: actions/upload-artifact@main
@@ -266,7 +264,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
@@ -392,7 +390,6 @@ jobs:
       if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
         rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
-        ls openwrt/bin/Firmware
 
     - name: Upload Firmware to Github Release
       uses: svenstaro/upload-release-action@v2

.github/workflows/X-x86_64_Z_Mine.yml

@@ -164,9 +164,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -256,7 +256,7 @@ jobs:
     - name: Download Github Release API
       if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
-        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
+        wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
         SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
         SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
         SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}

.github/workflows/X-x86_64_Z_Mine_home.yml

@@ -164,9 +164,9 @@ jobs:
         ./scripts/feeds update -a
         ./scripts/feeds install -a
         ./scripts/feeds uninstall luci-theme-argon
-        # Update golang to 1.22 for xray-core build
+        # Update golang to 1.24 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

CustomFiles/Patches/fix_mac80211.patch

@@ -1,13 +0,0 @@
-diff --git a/package/kernel/mac80211/intel.mk b/package/kernel/mac80211/intel.mk
-index 8d374d73e744..839127b6306d 100644
---- a/package/kernel/mac80211/intel.mk
-+++ b/package/kernel/mac80211/intel.mk
-@@ -6,7 +6,7 @@ config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
- 
- define KernelPackage/iwlwifi
-   $(call KernelPackage/mac80211/Default)
--  DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT
-+  DEPENDS:= @PCI_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT +kmod-mac80211 +LINUX_6_1:kmod-fs-efivarfs
-   TITLE:=Intel AGN Wireless support
-   FILES:= \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \

Scripts/AutoBuild_Function.sh

@@ -23,11 +23,8 @@ Firmware_Diy_Before() {
 	fi
 	case "${OP_AUTHOR}/${OP_REPO}" in
 	coolsnowwolf/lede)
-		# Version_File=package/lean/default-settings/files/zzz-default-settings
-		# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
 		Version_File=package/lean/default-settings/files/zzz-default-settings
-		Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
+		zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
-		zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
 		OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
 	;;
 	immortalwrt/immortalwrt)

Scripts/AutoBuild_Getenv.sh

@@ -18,7 +18,10 @@ echo "------------------------------- IP Address Info --------------------------
 IP=`curl ip.115115.xyz -s`
 curl ip.115115.xyz -s
 # curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
-curl -s  https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
+Addr_Country=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .country`
+Addr_Province=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .regionName`
+Addr_City=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .city`
+echo "${Addr_Country}, ${Addr_Province}, ${Addr_City}"
 }
 
 Get_Release_Info() {