.github/workflows/X-x86_64_Z.yml

@@ -65,9 +65,9 @@ jobs:
     - name: Maximize Build Space
       uses: easimon/maximize-build-space@master
       with:
-        root-reserve-mb: 4096
+        root-reserve-mb: 512
         swap-size-mb: 512
-        temp-reserve-mb: 1024
+        temp-reserve-mb: 999
         remove-dotnet: 'true'
         remove-android: 'true'
 
@@ -140,7 +140,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo -E apt-get update
-        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 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 llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir

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
 
@@ -113,12 +113,10 @@ EOF
 			patch < ${CustomFiles}/d-team_newifi-d2_mt76_dualband.patch -p1 -d ${WORK}
 		;;
 		x86_64)
-			rm -rf ${FEEDS_PKG}/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 ${FEEDS_LUCI}/applications/luci-app-passwall
 			Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
-			AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
+			AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
-			AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
+			AddPackage git passwall-luci openwrt-passwall xiaorouji main
-			AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
+			AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
 			AddPackage git other luci-app-dockerman lisaac master
 			rm -rf packages/lean/autocore # May Can Delete
 			AddPackage git lean autocore-modify xopenwrt master