fix apt err

.github/workflows/Module-Refresh_API.yml

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

.github/workflows/X-x86_64_X.yml

@@ -80,11 +80,11 @@ jobs:
     - name: Maximize Build Space
       uses: easimon/maximize-build-space@master
       with:
-        root-reserve-mb: 3500
+        root-reserve-mb: 4096
-        swap-size-mb: 100
+        swap-size-mb: 512
+        temp-reserve-mb: 1024
         remove-dotnet: 'true'
         remove-android: 'true'
-        remove-haskell: 'true'
 
     - name: Checkout
       uses: actions/checkout@main
@@ -151,7 +151,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo -E apt-get update
-        sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
+        sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
         sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
@@ -180,7 +180,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 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 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -212,6 +212,8 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -313,7 +315,7 @@ jobs:
     - name: 1 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -322,7 +324,7 @@ jobs:
     - name:  2 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -331,7 +333,7 @@ jobs:
     - name:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -340,7 +342,7 @@ jobs:
     - name:  6 Upload SP_LEGACY_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}

.github/workflows/X-x86_64_Y.yml

@@ -65,11 +65,11 @@ jobs:
     - name: Maximize Build Space
       uses: easimon/maximize-build-space@master
       with:
-        root-reserve-mb: 5120
+        root-reserve-mb: 4096
         swap-size-mb: 512
+        temp-reserve-mb: 1024
         remove-dotnet: 'true'
         remove-android: 'true'
-        remove-haskell: 'true'
 
     - name: Checkout
       uses: actions/checkout@main
@@ -142,7 +142,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo -E apt-get update
-        sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
+        sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
         sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
@@ -177,7 +177,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 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 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -209,6 +209,8 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -308,7 +310,7 @@ jobs:
     - name: 1 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -317,7 +319,7 @@ jobs:
     - name:  2 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -326,7 +328,7 @@ jobs:
     - name:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -335,7 +337,7 @@ jobs:
     - name:  6 Upload SP_LEGACY_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}

.github/workflows/X-x86_64_Z.yml

@@ -65,8 +65,9 @@ jobs:
     - name: Maximize Build Space
       uses: easimon/maximize-build-space@master
       with:
-        root-reserve-mb: 5120
+        root-reserve-mb: 4096
         swap-size-mb: 512
+        temp-reserve-mb: 1024
         remove-dotnet: 'true'
         remove-android: 'true'
 
@@ -139,7 +140,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo -E apt-get update
-        sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
+        sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
         sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
@@ -175,7 +176,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 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 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -207,6 +208,8 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -306,7 +309,7 @@ jobs:
     - name: 1 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -315,7 +318,7 @@ jobs:
     - name:  2 Upload SP_UEFI_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}e/${{ env.SP_UEFI_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -346,7 +349,7 @@ jobs:
     - name:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
@@ -355,7 +358,7 @@ jobs:
     - name:  6 Upload SP_LEGACY_VMDK to SharePoint
       uses: xopenwrt/s3-upload-github-action@master
       env:
-        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
         S3_ENDPOINT: 's3.openwrt.115115.xyz'
         S3_BUCKET: ${{ secrets.S3_BUCKET }}
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}

Scripts/AutoBuild_DiyScript.sh

@@ -95,8 +95,8 @@ EOF
 		# done ; unset x
 		
 		patch < ${CustomFiles}/Patches/fix_coremark.patch -p1 -d ${WORK}
-		#patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
+		# patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
-		patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
+		# patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
 		# delete adguardhome in lede package
 		# rm package/feeds/packages/net/adguardhome -rf
 
@@ -114,9 +114,9 @@ EOF
 		;;
 		x86_64)
 			Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
-			AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
+			AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
-			AddPackage git passwall-luci openwrt-passwall xiaorouji main
+			AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
-			AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
+			AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
 			AddPackage git other luci-app-dockerman lisaac master
 			rm -rf packages/lean/autocore # May Can Delete
 			AddPackage git lean autocore-modify xopenwrt master