优化调整

CustomFiles/Depends/profile

@@ -86,8 +86,6 @@ then
 fi
 
 alias reload='/etc/profile'
-alias autoupdate='bash /bin/AutoUpdate.sh'
-alias tools='bash /bin/AutoBuild_Tools.sh'
 alias coremarkd='/etc/coremark.sh'
 alias shutdown='sync && poweroff'
 alias ls='ls --color=auto'

CustomFiles/Depends/tools

@@ -3,7 +3,7 @@
 # AutoBuild_Tools for Openwrt
 # Dependences: bash wget curl block-mount e2fsprogs smartmontools
 
-Version=V1.8.6
+Version=V1.8.7
 
 ECHO() {
 	case $1 in
@@ -45,17 +45,17 @@ ${White}q. 退出
 		[[ -s ${AutoUpdate_File} ]] && {
 			AutoUpdate_UI
 		} || {
-			ECHO r "\n未检测到 '/bin/AutoUpdate.sh',请确保当前固件支持一键更新!"
+			ECHO r "\n未检测到 ${AutoUpdate_File}, 请确保当前固件支持定时更新!"
 			sleep 2
 		}
 	;;
 	x)
-		wget -q ${Github_Raw}/Scripts/AutoBuild_Tools.sh -O ${Tools_Cache}/AutoBuild_Tools.sh
-		if [[ $? == 0 && -s ${Tools_Cache}/AutoBuild_Tools.sh ]]
+		wget -q ${Github_Raw}/CustomFiles/Depends/tools -O ${Tools_Cache}/tools
+		if [[ $? == 0 && -s ${Tools_Cache}/tools ]]
 		then
 			ECHO y "\n[AutoBuild_Tools] 脚本更新成功!"
 			rm -f ${Tools_File}
-			mv -f ${Tools_Cache}/AutoBuild_Tools.sh ${Tools_File}
+			mv -f ${Tools_Cache}/tools ${Tools_File}
 			chmod +x ${Tools_File}
 			sleep 2
 			exec ${Tools_File}
@@ -125,12 +125,12 @@ ${White}q. 退出
 		}
 	;;
 	6)
-		cp -a /rom/etc/AutoBuild/Default_Variable /etc/AutoBuild
 		cp -a /rom/etc/profile /etc
 		cp -a /rom/etc/banner /etc
 		cp -a /rom/etc/openwrt_release /etc
-		cp -a /rom/bin/AutoUpdate.sh ${AutoUpdate_File}
-		cp -a /rom/bin/AutoBuild_Tools.sh ${Tools_File}
+		cp -a /rom/etc/autoupdate/default /etc/autoupdate
+		cp -a /rom/bin/autoupdate ${AutoUpdate_File}
+		cp -a /rom/bin/tools ${Tools_File}
 		cp -a /rom/etc/config/autoupdate /etc/config
 		ECHO y "\n固件环境修复完成!"
 		sleep 2
@@ -467,7 +467,7 @@ ${Red}3. 更新固件 [保留配置]${White}
 8. 打印脚本运行日志 (反馈问题)
 9. 检查 AutoUpdate 运行环境
 10. 备份系统配置
-$([ $(bash ${AutoUpdate_File} --var TARGET_BOARD) == x86 ] && echo "11. 指定下载 <UEFI | BIOS> 引导的固件\n")
+$([ $(bash ${AutoUpdate_File} --env TARGET_BOARD) == x86 ] && echo "11. 指定下载 <UEFI | BIOS> 引导的固件\n")
 ${Yellow}x. 更新 [AutoUpdate] 脚本
 ${White}q. 返回\n"
 	read -p "请从上方选择一个操作:" Choose
@@ -724,8 +724,9 @@ Grey="\e[36m"
 Green="\e[32m"
 
 Tools_Cache=/tmp/AutoBuild_Tools
-Tools_File=$(cd $(dirname $0) && pwd)/AutoBuild_Tools.sh
-AutoUpdate_File=/bin/AutoUpdate.sh
+Tools_File=$(command -v tools)
+AutoUpdate_File=$(command -v autoupdate)
+
 [[ ! -d ${Tools_Cache} ]] && mkdir -p ${Tools_Cache}
 Github_Raw="https://ghproxy.com/https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master"
 AutoBuild_Tools_UI

CustomFiles/Patches/fix_upx-ucl-19.07.patch

@@ -1,136 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: slitaz-cn <teasiu@163.com>
-Date: Tue, 6 Apr 2021 01:25:07 +0800
-Subject: [PATCH] add upx ucl for 19.07.7
-
-Signed-off-by: slitaz-cn <teasiu@163.com>
----
- tools/Makefile     |  3 ++-
- tools/ucl/Makefile | 51 ++++++++++++++++++++++++++++++++++++++++++++++
- tools/upx/Makefile | 35 +++++++++++++++++++++++++++++++
- 3 files changed, 88 insertions(+), 1 deletion(-)
- create mode 100644 tools/ucl/Makefile
- create mode 100644 tools/upx/Makefile
-
-diff --git a/tools/Makefile b/tools/Makefile
-index b8d986b80c..bcde9a720d 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -33,7 +33,7 @@ tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
- tools-$(CONFIG_TARGET_ar71xx) += lzma-old
- tools-$(CONFIG_TARGET_ar71xx)$(CONFIG_TARGET_ath79) += squashfs
- tools-$(CONFIG_USES_MINOR) += kernel2minor
--tools-y += lzma squashfskit4 zip
-+tools-y += lzma squashfskit4 zip ucl upx
- tools-$(BUILD_B43_TOOLS) += b43-tools
- tools-$(BUILD_ISL) += isl
- tools-$(CONFIG_USE_SPARSE) += sparse
-@@ -46,6 +46,7 @@ $(curdir)/flex/compile := $(curdir)/libtool/compile
- $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile
- $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
- $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
-+$(curdir)/upx/compile := $(curdir)/ucl/compile
- $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile
- $(curdir)/autoconf/compile := $(curdir)/m4/compile
- $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkg-config/compile $(curdir)/xz/compile
-diff --git a/tools/ucl/Makefile b/tools/ucl/Makefile
-new file mode 100644
-index 0000000000..9fb9aec117
---- /dev/null
-+++ b/tools/ucl/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# Copyright (C) 2019 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=ucl
-+PKG_VERSION:=1.03
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/$(PKG_SOURCE)
-+PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+HOSTCC :=gcc
-+HOST_CFLAGS +=-std=gnu89
-+
-+define Host/Prepare
-+	$(Host/Prepare/Default)
-+	mkdir -p $(STAGING_DIR_HOST)/include/ucl
-+endef
-+
-+define Host/Configure
-+	(cd $(HOST_BUILD_DIR); \
-+	CC="$(HOSTCC)" \
-+	CFLAGS="$(HOST_CFLAGS)" \
-+	./configure --prefix=$(STAGING_DIR_HOST) \
-+	);
-+	$(call Host/Configure/Default)
-+endef
-+
-+define Host/Compile
-+	$(MAKE) -C $(HOST_BUILD_DIR)
-+endef
-+
-+define Host/Install
-+	$(MAKE) -C $(HOST_BUILD_DIR) install
-+endef
-+
-+define Host/Clean
-+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-+	rm -rf $(HOST_BUILD_DIR)
-+	rm -rf $(STAGING_DIR_HOST)/include/ucl
-+endef
-+
-+$(eval $(call HostBuild))
-diff --git a/tools/upx/Makefile b/tools/upx/Makefile
-new file mode 100644
-index 0000000000..fbf1dfbd2e
---- /dev/null
-+++ b/tools/upx/Makefile
-@@ -0,0 +1,35 @@
-+#
-+# Copyright (C) 2011-2020 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=upx
-+PKG_VERSION:=3.95
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.xz
-+PKG_SOURCE_URL:=https://github.com/upx/upx/releases/download/v$(PKG_VERSION)
-+PKG_HASH:=3b0f55468d285c760fcf5ea865a070b27696393002712054c69ff40d8f7f5592
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)-src
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+define Host/Compile
-+	UPX_UCLDIR=$(STAGING_DIR_HOST) \
-+	$(MAKE) -C $(HOST_BUILD_DIR)/src \
-+		CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS)" \
-+		CXX="$(HOSTCXX)"
-+endef
-+
-+define Host/Install
-+	$(CP) $(HOST_BUILD_DIR)/src/upx.out $(STAGING_DIR_HOST)/bin/upx
-+endef
-+
-+define Host/Clean
-+	rm -f $(STAGING_DIR_HOST)/bin/upx
-+endef
-+
-+$(eval $(call HostBuild))
--- 
-2.20.1
-

CustomFiles/Patches/fix_upx-ucl-21.02.patch

@@ -1,136 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chuck <fanck0605@qq.com>
-Date: Mon, 13 Jul 2020 13:09:02 +0800
-Subject: [PATCH] tools: add ucl and upx compresss
-
-Signed-off-by: Chuck <fanck0605@qq.com>
----
- tools/Makefile     |  3 ++-
- tools/ucl/Makefile | 51 ++++++++++++++++++++++++++++++++++++++++++++++
- tools/upx/Makefile | 35 +++++++++++++++++++++++++++++++
- 3 files changed, 88 insertions(+), 1 deletion(-)
- create mode 100644 tools/ucl/Makefile
- create mode 100644 tools/upx/Makefile
-
-diff --git a/tools/Makefile b/tools/Makefile
-index a2665dbc9a..6dd93f3cfe 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -25,7 +25,7 @@ tools-y += autoconf autoconf-archive automake bc bison cmake dosfstools
- tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt
- tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage
- tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image
--tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd
-+tools-y += patchelf pkgconf quilt squashfskit4 sstrip ucl upx zip zlib zstd
- tools-$(BUILD_B43_TOOLS) += b43-tools
- tools-$(BUILD_ISL) += isl
- tools-$(BUILD_TOOLCHAIN) += expat gmp libelf mpc mpfr
-@@ -71,6 +71,7 @@ $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compil
- $(curdir)/sdcc/compile := $(curdir)/bison/compile
- $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
- $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
-+$(curdir)/upx/compile := $(curdir)/ucl/compile
- $(curdir)/zlib/compile := $(curdir)/cmake/compile
- $(curdir)/zstd/compile := $(curdir)/cmake/compile
- 
-diff --git a/tools/ucl/Makefile b/tools/ucl/Makefile
-new file mode 100644
-index 0000000000..9fb9aec117
---- /dev/null
-+++ b/tools/ucl/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# Copyright (C) 2019 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=ucl
-+PKG_VERSION:=1.03
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/$(PKG_SOURCE)
-+PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+HOSTCC :=gcc
-+HOST_CFLAGS +=-std=gnu89
-+
-+define Host/Prepare
-+	$(Host/Prepare/Default)
-+	mkdir -p $(STAGING_DIR_HOST)/include/ucl
-+endef
-+
-+define Host/Configure
-+	(cd $(HOST_BUILD_DIR); \
-+	CC="$(HOSTCC)" \
-+	CFLAGS="$(HOST_CFLAGS)" \
-+	./configure --prefix=$(STAGING_DIR_HOST) \
-+	);
-+	$(call Host/Configure/Default)
-+endef
-+
-+define Host/Compile
-+	$(MAKE) -C $(HOST_BUILD_DIR)
-+endef
-+
-+define Host/Install
-+	$(MAKE) -C $(HOST_BUILD_DIR) install
-+endef
-+
-+define Host/Clean
-+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-+	rm -rf $(HOST_BUILD_DIR)
-+	rm -rf $(STAGING_DIR_HOST)/include/ucl
-+endef
-+
-+$(eval $(call HostBuild))
-diff --git a/tools/upx/Makefile b/tools/upx/Makefile
-new file mode 100644
-index 0000000000..fbf1dfbd2e
---- /dev/null
-+++ b/tools/upx/Makefile
-@@ -0,0 +1,35 @@
-+#
-+# Copyright (C) 2011-2020 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=upx
-+PKG_VERSION:=3.95
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.xz
-+PKG_SOURCE_URL:=https://github.com/upx/upx/releases/download/v$(PKG_VERSION)
-+PKG_HASH:=3b0f55468d285c760fcf5ea865a070b27696393002712054c69ff40d8f7f5592
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)-src
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+define Host/Compile
-+	UPX_UCLDIR=$(STAGING_DIR_HOST) \
-+	$(MAKE) -C $(HOST_BUILD_DIR)/src \
-+		CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS)" \
-+		CXX="$(HOSTCXX)"
-+endef
-+
-+define Host/Install
-+	$(CP) $(HOST_BUILD_DIR)/src/upx.out $(STAGING_DIR_HOST)/bin/upx
-+endef
-+
-+define Host/Clean
-+	rm -f $(STAGING_DIR_HOST)/bin/upx
-+endef
-+
-+$(eval $(call HostBuild))
--- 
-2.25.1
-

CustomFiles/d-team_newifi-d2_mac80211.patch

@@ -1,21 +0,0 @@
---- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-@@ -174,14 +174,15 @@ detect_mac80211() {
- 			set wireless.radio${devidx}.channel=${channel}
- 			set wireless.radio${devidx}.band=${mode_band}
- 			set wireless.radio${devidx}.htmode=$htmode
-+			set wireless.radio${devidx}.country=CN
- 			set wireless.radio${devidx}.disabled=0
--			set wireless.radio${devidx}.country=US
--			
-+
- 			set wireless.default_radio${devidx}=wifi-iface
- 			set wireless.default_radio${devidx}.device=radio${devidx}
-+			set wireless.default_radio0.ssid=OpenWrt_2.4G
-+			set wireless.default_radio1.ssid=OpenWrt_5G
- 			set wireless.default_radio${devidx}.network=lan
- 			set wireless.default_radio${devidx}.mode=ap
--			set wireless.default_radio${devidx}.ssid=OpenWrt
- 			set wireless.default_radio${devidx}.encryption=none
- EOF
- 		uci -q commit wireless

README.md

@@ -61,8 +61,6 @@ AutoBuild-Actions 稳定版仓库地址: [AutoBuild-Actions-Template](https://gi
 
    AutoBuild_Features 自动添加 AutoBuild 固件特性, 例如 一键更新固件; 固件工具箱
 
-   Compatible 完善原生 OpenWrt 支持, 例如 true: [自动识别]; 自选版本号: 19.07; 21.02
-   
    注: 禁用某功能请将变量值修改为 false, 开启则为 true
 
 ```

Scripts/AutoBuild_DiyScript.sh

@@ -16,7 +16,6 @@ Firmware_Diy_Core() {
 	Regex_Skip="packages|buildinfo|sha256sums|manifest|kernel|rootfs|factory|itb|profile"
 
 	AutoBuild_Features=true
-	Compatible=false
 }
 
 Firmware_Diy() {
@@ -42,11 +41,11 @@ Firmware_Diy() {
 
 	case "${OP_AUTHOR}/${OP_REPO}:${OP_BRANCH}" in
 	coolsnowwolf/lede:master)
+		rm -r $(PKG_Finder d "package feeds" luci-theme-argon)
 		sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config
-		rm -rf $(PKG_Finder d "package feeds" luci-theme-argon)
+		
 		AddPackage git lean luci-theme-argon jerrykuku 18.06
 		AddPackage git lean luci-app-argon-config jerrykuku master
-		AddPackage git other AutoBuild-Packages Hyy2001X master
 		AddPackage svn other luci-app-smartdns immortalwrt/luci/branches/openwrt-18.06/applications
 		sed -i 's/..\/..\//\$\(TOPDIR\)\/feeds\/luci\//g' $(PKG_Finder d package luci-app-smartdns)/Makefile
 		AddPackage svn other luci-app-eqos immortalwrt/luci/branches/openwrt-18.06/applications
@@ -57,32 +56,31 @@ Firmware_Diy() {
 		AddPackage git other luci-app-ikoolproxy iwrt main
 		AddPackage git other helloworld fw876 master
 		sed -i 's/143/143,8080,8443/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
-		patch < ${CustomFiles}/Patches/revert_remove-alterId-config.patch -p1 -d ${WORK}
-		patch < ${CustomFiles}/Patches/fix_ntfs3_antfs_conflict.patch -p1 -d ${WORK}
-		patch < ${CustomFiles}/Patches/fix_aria2_autocreate_path.patch -p1 -d ${WORK}
+
+		patch < ${CustomFiles}/Patches/fix_shadowsocksr_alterId.patch -p1 -d ${WORK}
+		patch < ${CustomFiles}/Patches/fix_ntfs3_conflict_with_antfs.patch -p1 -d ${WORK}
+		patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
 
 		case "${TARGET_PROFILE}" in
 		d-team_newifi-d2)
-			# patch < ${CustomFiles}/${TARGET_PROFILE}_mac80211.patch -p1 -d ${WORK}
 			Copy ${CustomFiles}/${TARGET_PROFILE}_system ${BASE_FILES}/etc/config system
 			sed -i "/DEVICE_COMPAT_VERSION := 1.1/d" target/linux/ramips/image/mt7621.mk
-			Copy ${CustomFiles}/fake-automount $(PKG_Finder d "package" automount)/files 15-automount
+			Copy ${CustomFiles}/Depends/automount $(PKG_Finder d "package" automount)/files 15-automount
 		;;
 		xiaoyu_xy-c5)
-			Copy ${CustomFiles}/fake-automount $(PKG_Finder d "package" automount)/files 15-automount
+			Copy ${CustomFiles}/Depends/automount $(PKG_Finder d "package" automount)/files 15-automount
 		;;
 		x86_64)
 			AddPackage git passwall-depends openwrt-passwall xiaorouji packages
 			AddPackage git passwall-luci openwrt-passwall xiaorouji luci
 			rm -rf packages/lean/autocore
 			AddPackage git lean autocore-modify Hyy2001X master
-			cat ${CustomFiles}/x86_64_kconfig >> ${WORK}/target/linux/x86/config-5.15
+			cat ${CustomFiles}/x86_64_Kconfig >> ${WORK}/target/linux/x86/config-5.15
 		;;
 		esac
 	;;
 	immortalwrt/immortalwrt*)
 		sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config
-		AddPackage git other AutoBuild-Packages Hyy2001X master
 	;;
 	esac
 }

Scripts/AutoBuild_Function.sh

@@ -127,14 +127,8 @@ Firmware_Diy_Main() {
 	chmod 777 -R ${Scripts} ${CustomFiles}
 	if [[ ${AutoBuild_Features} == true ]]
 	then
-		MKDIR ${BASE_FILES}/etc/AutoBuild
-		touch ${BASE_FILES}/etc/AutoBuild/Default_Variable ${BASE_FILES}/etc/AutoBuild/Custom_Variable
-		cat >> ${BASE_FILES}/etc/AutoBuild/Default_Variable <<EOF
-## 请不要修改此文件中的内容, 自定义变量请在 Custom_Variable 中添加或修改
-## 该文件将在运行 AutoUpdate.sh 时被读取, 该文件中的变量优先级低于 Custom_Variable
-
-EOF
-		for i in ${BASE_FILES}/etc/AutoBuild/Default_Variable ${GITHUB_ENV}
+		AddPackage git other AutoBuild-Packages Hyy2001X master
+		for i in ${GITHUB_ENV} $(PKG_Finder d package luci-app-autoupdate)/root/etc/autoupdate/default
 		do
 			cat >> ${i} <<EOF
 Author=${Author}
@@ -149,28 +143,14 @@ OP_REPO=${OP_REPO}
 OP_BRANCH=${OP_BRANCH}
 
 EOF
-		done
-		unset i
-		cat >> ${BASE_FILES}/etc/AutoBuild/Custom_Variable <<EOF
-## 请在下方输入你的自定义变量,一行只能填写一个变量
-## 该文件将在运行 AutoUpdate.sh 时被读取, 该文件中的变量优先级高于 Default_Variable
-## 示例:
-# Author=Hyy2001
-# TARGET_PROFILE=x86_64
-# Github=https://github.com/Hyy2001X/AutoBuild-Actions
-# Tmp_Path=/tmp/AutoUpdate
-# Log_Path=/tmp
-
-EOF
-		Copy ${Scripts}/AutoBuild_Tools.sh ${BASE_FILES}/bin
-		Copy ${Scripts}/AutoUpdate.sh ${BASE_FILES}/bin
-		AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${BASE_FILES}/bin/AutoUpdate.sh | awk 'NR==1')
-		AddPackage svn other luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk
+		done ; unset i
+		AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' $(PKG_Finder d package luci-app-autoupdate)/root/bin/autoupdate | awk 'NR==1')
+		Copy ${CustomFiles}/Depends/tools ${BASE_FILES}/bin
 		Copy ${CustomFiles}/Depends/profile ${BASE_FILES}/etc
 		Copy ${CustomFiles}/Depends/base-files-essential ${BASE_FILES}/lib/upgrade/keep.d
 		case "${OP_AUTHOR}/${OP_REPO}" in
 		coolsnowwolf/lede)
-			Copy ${CustomFiles}/Depends/coremark.sh ${WORK}/$(PKG_Finder d "package feeds" coremark)
+			Copy ${CustomFiles}/Depends/coremark.sh $(PKG_Finder d "package feeds" coremark)
 			sed -i '\/etc\/firewall.user/d;/exit 0/d' ${Version_File}
 			cat >> ${Version_File} <<EOF
 
@@ -227,7 +207,7 @@ EOF
 		fi
 		case "${OP_AUTHOR}/${OP_REPO}" in
 		immortalwrt/immortalwrt)
-			Copy ${CustomFiles}/Depends/banner ${WORK}/$(PKG_Finder d package default-settings)/files openwrt_banner
+			Copy ${CustomFiles}/Depends/banner $(PKG_Finder d package default-settings)/files openwrt_banner
 		;;
 		*)
 			Copy ${CustomFiles}/Depends/banner ${BASE_FILES}/etc
@@ -259,47 +239,6 @@ EOF
 Firmware_Diy_Other() {
 	ECHO "[Firmware_Diy_Other] Starting ..."
 	CD ${WORK}
-	case "${Compatible}" in
-	19.07)
-		OP_BRANCH=19.07
-		Force_mode=1
-		Compatible=true
-	;;
-	21.02)
-		OP_BRANCH=21.02
-		Force_mode=1
-		Compatible=true
-	;;
-	esac
-	if [[ ${Compatible} == true ]]
-	then
-		if [[ ${OP_AUTHOR} =~ (openwrt|[Ll]ienol) || ${Force_mode} == 1 ]]
-		then
-			ECHO "Starting to run [Obsolete_Package_Compatible] Script ..."
-			case "${OP_BRANCH}" in
-			19.07 | 21.02 | main)
-				[[ ${OP_BRANCH} == main ]] && OP_BRANCH=21.02
-				cat >> ${CONFIG_TEMP} <<EOF
-
-# CONFIG_PACKAGE_dnsmasq is not set
-CONFIG_PACKAGE_dnsmasq-full=y
-# CONFIG_PACKAGE_wpad-wolfssl is not set
-CONFIG_PACKAGE_wpad-openssl=y
-EOF
-				Copy ${CustomFiles}/Patches/fix_upx-ucl-${OP_BRANCH}.patch ${WORK}
-				cat fix_upx-ucl-${OP_BRANCH}.patch | patch -p1 > /dev/null 2>&1
-				AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang
-				ECHO "Starting to convert zh-cn translation files to zh_Hans ..."
-				cd package && bash ${Scripts}/Convert_Translation.sh && cd -
-			;;
-			*)
-				ECHO "[${OP_BRANCH}]: Current OP_BRANCH is not supported !"
-			;;
-			esac
-		else
-			ECHO "[${OP_AUTHOR}]: Current OP_AUTHOR is not supported !"
-		fi
-	fi
 	if [[ -n ${Author_URL} ]]
 	then
 			cat >> ${CONFIG_TEMP} <<EOF