fix adguardhome err

.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,8 +212,11 @@ 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
+        rm feeds/luci/applications/luci-app-adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
         # 2024.03.03 mosdns build fail by golang 1.22
         sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
@@ -313,7 +316,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 +325,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 +334,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 +343,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,8 +209,11 @@ 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
+        rm feeds/luci/applications/luci-app-adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
         # 2024.03.03 mosdns build fail by golang 1.22
         sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
@@ -308,7 +311,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 +320,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 +329,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 +338,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,10 +208,13 @@ 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
+        rm feeds/luci/applications/luci-app-adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
-        make -j4 | tee ./build_log.log || make -j1 V=s
+        set -o pipefail && make -j4 2>&1 | tee build_log.log || make -j1 V=s
         # 2024.03.03 mosdns build fail by golang 1.22
         sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
@@ -306,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 }}
@@ -315,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 }}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 +350,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 +359,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 }}

Configs/x86_64-Y

@@ -87,6 +87,10 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=800
 CONFIG_TARGET_IMAGES_GZIP=y
 CONFIG_PACKAGE_ntfs3-mount=y
 
+
+CONFIG_PACKAGE_xz=y
+CONFIG_PACKAGE_xz-utils=y
+
 # CONFIG_SIGNATURE_CHECK is not set
 # CONFIG_SIGNED_PACKAGES is not set
 # CONFIG_PACKAGE_luci-app-unblockmusic is not set

Configs/x86_64-Z

@@ -60,6 +60,9 @@ CONFIG_TARGET_IMAGES_GZIP=y
 CONFIG_PACKAGE_ntfs3-mount=y
 
 
+CONFIG_PACKAGE_xz=y
+CONFIG_PACKAGE_xz-utils=y
+
 # CONFIG_SIGNATURE_CHECK is not set
 # CONFIG_SIGNED_PACKAGES is not set
 # CONFIG_PACKAGE_luci-app-unblockmusic is not set

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