Compare commits

..
8 Commits
Author SHA1 Message Date
xopenwrt 2638e8eea4 Add auto retry when wget fail 2025-07-21 20:21:07 +08:00
xopenwrt ec6130e594 Test Remove AMD GPU Firmware 2025-07-21 04:40:45 +08:00
xopenwrt 8a642fcb31 fix xray build 2025-07-21 00:25:05 +08:00
xopenwrt 1b6da070d2 remove fix_mac80211 2025-07-20 22:49:18 +08:00
xopenwrt 110c498e00 Remove Patch 2025-07-20 22:39:07 +08:00
xopenwrt 4695b0eb6a fix IP API 2025-07-20 22:31:14 +08:00
xopenwrt 9dc6c25565 Remove Docker images delete function 2025-07-20 22:07:29 +08:00
xopenwrt 0fe7ed015e Add test cmd. 2025-07-20 22:02:17 +08:00
19 changed files with 49 additions and 47 deletions
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+1 -1
View File
@@ -215,7 +215,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+1 -1
View File
@@ -216,7 +216,7 @@ jobs:
- name: Download Github API - name: Download Github API
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
run: | 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 - name: Upload Github API to Release
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+1 -1
View File
@@ -30,7 +30,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
run: | 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 - name: Upload API to Github Release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
+1 -2
View File
@@ -136,7 +136,6 @@ jobs:
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then 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 rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@@ -221,7 +220,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+11 -4
View File
@@ -26,6 +26,9 @@ on:
Tempoary_FLAG: Tempoary_FLAG:
description: '固件名称后缀 [可选]' description: '固件名称后缀 [可选]'
default: 'X' default: 'X'
Tempoary_Remove_AMDGPU:
description: '是否移除AMD GPU驱动'
default: 'true'
### 结束 ### 结束
#push: #push:
@@ -68,11 +71,11 @@ jobs:
echo "::set-output name=date::$(date +'%Y-%m-%d')" echo "::set-output name=date::$(date +'%Y-%m-%d')"
echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $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 "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then 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 rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@@ -179,9 +182,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -199,6 +202,10 @@ jobs:
make defconfig make defconfig
Firmware_Diy_Before Firmware_Diy_Before
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config 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_Main
Firmware_Diy Firmware_Diy
Firmware_Diy_Other Firmware_Diy_Other
@@ -274,7 +281,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+11 -3
View File
@@ -26,6 +26,9 @@ on:
Tempoary_FLAG: Tempoary_FLAG:
description: '固件名称后缀 [可选]' description: '固件名称后缀 [可选]'
default: 'X' default: 'X'
Tempoary_Remove_AMDGPU:
description: '是否移除AMD GPU驱动'
default: 'true'
### 结束 ### 结束
#push: #push:
@@ -74,6 +77,7 @@ jobs:
echo "::set-output name=date::$(date +'%Y-%m-%d')" echo "::set-output name=date::$(date +'%Y-%m-%d')"
echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $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 "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
@@ -168,9 +172,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -188,6 +192,10 @@ jobs:
make defconfig make defconfig
Firmware_Diy_Before Firmware_Diy_Before
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config 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_Main
Firmware_Diy Firmware_Diy
Firmware_Diy_Other Firmware_Diy_Other
@@ -264,7 +272,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+3 -4
View File
@@ -149,7 +149,6 @@ jobs:
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then 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 rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@@ -176,9 +175,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -269,7 +268,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+3 -5
View File
@@ -146,8 +146,6 @@ jobs:
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker images
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 rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@@ -174,9 +172,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -266,7 +264,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+3 -3
View File
@@ -164,9 +164,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -256,7 +256,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | 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=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
+2 -2
View File
@@ -164,9 +164,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./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 rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.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 # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
-13
View File
@@ -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 \
+1 -1
View File
@@ -123,7 +123,7 @@ EOF
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile #sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
#fix hostapd #fix hostapd
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa* sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
;; ;;
+5 -1
View File
@@ -17,7 +17,11 @@ df -h
echo "------------------------------- IP Address Info ------------------------------" echo "------------------------------- IP Address Info ------------------------------"
IP=`curl ip.115115.xyz -s` IP=`curl ip.115115.xyz -s`
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://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
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() { Get_Release_Info() {