调整架构,分离软件包添加列表

CustomPackages/d-team_newifi-d2

@@ -0,0 +1,10 @@
+git other OpenClash https://github.com/vernesong master
+git other luci-app-argon-config https://github.com/jerrykuku
+git other luci-app-adguardhome https://github.com/Hyy2001X
+svn other luci-app-smartdns https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
+git other luci-app-serverchan https://github.com/tty228
+svn other luci-app-socat https://github.com/Lienol/openwrt-package/trunk
+svn other luci-app-usb3disable https://github.com/immortalwrt/luci/trunk/applications
+svn other luci-app-eqos https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
+git other luci-app-bearDropper https://github.com/NateLol
+git other luci-app-onliner https://github.com/rufengsuixing

CustomPackages/x86_64

@@ -0,0 +1,10 @@
+git other OpenClash https://github.com/vernesong master
+git other openwrt-passwall https://github.com/xiaorouji main
+git other luci-app-argon-config https://github.com/jerrykuku
+git other luci-app-adguardhome https://github.com/Hyy2001X
+git other luci-app-shutdown https://github.com/Hyy2001X
+svn other luci-app-smartdns https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
+git other luci-app-serverchan https://github.com/tty228
+svn other luci-app-socat https://github.com/Lienol/openwrt-package/trunk
+git other luci-app-bearDropper https://github.com/NateLol
+git other luci-app-onliner https://github.com/rufengsuixing

Scripts/AutoBuild_DiyScript.sh

@@ -17,37 +17,24 @@ Diy-Part1() {
 
 	Update_Makefile xray-core package/lean/helloworld/xray-core
 	Update_Makefile exfat package/kernel/exfat
-
-	ExtraPackages git other OpenClash https://github.com/vernesong master
-	ExtraPackages git other openwrt-passwall https://github.com/xiaorouji main
-	ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku
-	ExtraPackages git other luci-app-adguardhome https://github.com/Hyy2001X
-	ExtraPackages git other luci-app-shutdown https://github.com/Hyy2001X
-	ExtraPackages svn other luci-app-smartdns https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
-	ExtraPackages git other luci-app-serverchan https://github.com/tty228
-	ExtraPackages svn other luci-app-socat https://github.com/Lienol/openwrt-package/trunk
-	ExtraPackages svn other luci-app-usb3disable https://github.com/immortalwrt/luci/trunk/applications
-	ExtraPackages svn other luci-app-eqos https://github.com/immortalwrt/immortalwrt/trunk/package/ntlf9t
-	ExtraPackages git other luci-app-bearDropper https://github.com/NateLol
-	ExtraPackages git other luci-app-onliner https://github.com/rufengsuixing
 }
 
 Diy-Part2() {
 	Diy_Part2_Base
 	ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
 
-	Replace_File Customize/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
+	Replace_File CustomFiles/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
-	Replace_File Customize/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
+	Replace_File CustomFiles/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
-	Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
+	Replace_File CustomFiles/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
 
 	case ${TARGET_PROFILE} in
 	d-team_newifi-d2)
-		Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
+		Replace_File CustomFiles/mac80211.sh package/kernel/mac80211/files/lib/wifi
-		Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system
+		Replace_File CustomFiles/system_newifi-d2 package/base-files/files/etc/config system
-		Replace_File Customize/102-mt7621-fix-cpu-clk-add-clkdev.patch target/linux/ramips/patches-5.4
+		Replace_File CustomFiles/102-mt7621-fix-cpu-clk-add-clkdev.patch target/linux/ramips/patches-5.4
 	;;
 	*)
-		Replace_File Customize/system_common package/base-files/files/etc/config system
+		Replace_File CustomFiles/system_common package/base-files/files/etc/config system
 	;;
 	esac
 }

Scripts/AutoBuild_Function.sh

@@ -52,6 +52,7 @@ GET_TARGET_INFO() {
 
 Diy_Part1_Base() {
 	Diy_Core
+
 	if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then
 		Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
 	fi
@@ -59,8 +60,7 @@ Diy_Part1_Base() {
 
 Diy_Part2_Base() {
 	GET_TARGET_INFO
-
+	Auto_ExtraPackages
-	Replace_File Customize/Depends/banner package/base-files/files/etc
 	if [[ "${INCLUDE_AutoUpdate}" == "true" ]];then
 		ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
 		Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
@@ -69,27 +69,28 @@ Diy_Part2_Base() {
 	else
 		sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
 	fi
+	Replace_File CustomFiles/Depends/banner package/base-files/files/etc
+	Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
 	case ${Source_Owner} in
 	coolsnowwolf)
-		Replace_File Customize/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
 		ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
 		ExtraPackages git lean helloworld https://github.com/fw876 master
 		Update_Makefile xray-core package/lean/helloworld/xray-core
 		sed -i 's/143/143,8080/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
-		Replace_File Customize/Depends/coremark_lede.sh package/lean/coremark coremark.sh
+		Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
 		ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
-
+		
 		sed -i "s?iptables?#iptables?g" ${Version_File} > /dev/null 2>&1
 		sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" $Version_File
 
 		if [[ "${INCLUDE_DRM_I915}" == "true" ]];then
-			Replace_File Customize/Depends/config-5.4 target/linux/x86
+			Replace_File CustomFiles/Depends/config-5.4 target/linux/x86
 		fi
 	;;
 	immortalwrt)
 		sed -i 's/143/143,8080/' package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
-		Replace_File Customize/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh
+		Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh
-		Replace_File Customize/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
+		Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
 		sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" $Version_File
 	;;
 	*)
@@ -186,6 +187,16 @@ PKG_Finder() {
 	fi
 }
 
+Auto_ExtraPackages() {
+	[[ ! -f "${GITHUB_WORKSPACE}/CustomPackages/${TARGET_PROFILE}" ]] && return
+	echo "CustomFile: ${TARGET_PROFILE} is detected !"
+	cat ${GITHUB_WORKSPACE}/CustomPackages/${TARGET_PROFILE} | while read X
+	do
+		ExtraPackages ${X}
+	done
+	echo "Done !"
+}
+
 ExtraPackages() {
 	PKG_PROTO=${1}
 	PKG_DIR=${2}
@@ -233,7 +244,7 @@ Replace_File() {
 			echo "[$(date "+%H:%M:%S")] Moving [${_TYPE2}] ${FILE_NAME} to ${2}/${FILE_RENAME} ..."
 			mv -f ${GITHUB_WORKSPACE}/${FILE_NAME} ${PATCH_DIR}/${_RENAME}
 		else
-			echo "[$(date "+%H:%M:%S")] Customize ${_TYPE2} [${FILE_NAME}] is not detected,skip move ..."
+			echo "[$(date "+%H:%M:%S")] CustomFiles ${_TYPE2} [${FILE_NAME}] is not detected,skip move ..."
 		fi
 	fi
 	unset FILE_NAME PATCH_DIR FILE_RENAME