调整架构;修复软件包丢失的问题

.github/workflows/d-team_newifi-d2.yml

@@ -25,7 +25,8 @@ on:
 
 env:
   REPO_URL: https://github.com/coolsnowwolf/lede
-  CONFIG_FILE: Configs/d-team_newifi-d2.config
+  REPO_BRANCH: master
+  CONFIG_FILE: d-team_newifi-d2
   DIY_SCRIPT: Scripts/AutoBuild_DiyScript.sh
   FUNCTION_SCRIPT: Scripts/AutoBuild_Function.sh
   UPLOAD_RELEASE: true
@@ -46,8 +47,8 @@ jobs:
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
+        echo "Deleting useless files, please wait ..."
         docker rmi `docker images -q`
-        echo "Deleting docker files, please wait ..."
         sudo rm -rf \
           /usr/share/dotnet \
           /etc/mysql \
@@ -72,33 +73,31 @@ jobs:
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
         sudo chown $USER:$GROUPS /workdir
-
-    - name: Clone Openwrt source code
-      run: |
-        git clone $REPO_URL openwrt
-        ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
-
-    - name: Run Diy-Part1 Scripts
-      run: |
-        chmod +x $DIY_SCRIPT
-        cd openwrt
-        source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part1
         echo "Compile_Date=$(date +%Y%m%d)" > $GITHUB_WORKSPACE/Openwrt.info
         echo "Display_Date=$(date +'%Y/%m/%d')" >> $GITHUB_WORKSPACE/Openwrt.info
+        echo "## $(date +"%Y%m%d")-$CONFIG_FILE" > update_log.txt
+        echo "Artifacts_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
 
-    - name: Update & Install Feeds
+    - name: Clone source code
+      run: |
+        git clone -b $REPO_BRANCH $REPO_URL openwrt
+        ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
+
+    - name: Update & Install all feeds
       run: |
         cd openwrt
         ./scripts/feeds update -a
         ./scripts/feeds install -a
 
-    - name: Run Diy-Part2 Scripts
+    - name: Run [Firmware-Diy] Scripts
       run: |
-        [ -f $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config
+        chmod +x $DIY_SCRIPT
+        chmod +x $FUNCTION_SCRIPT
+        [ -f Configs/$CONFIG_FILE ] && mv Configs/$CONFIG_FILE openwrt/.config
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part2
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Firmware-Diy_Base
+        Firmware-Diy
 
     - name: SSH connection to Actions
       uses: P3TERX/ssh2actions@v1.0.0
@@ -110,6 +109,8 @@ jobs:
     - name: Download Packages
       run: |
         cd openwrt
+        ./scripts/feeds update -a
+        ./scripts/feeds install -a
         make defconfig
         make download -j$(nproc) V=s
         find dl -size -1024c -exec rm -f {} \;
@@ -119,29 +120,27 @@ jobs:
         cd openwrt
         make -j$(nproc) || make -j1 V=s
 
-    - name: Run Diy-Part3 Scripts
+    - name: Process the AutoBuild Firmware
       run: |
-        echo "## $(date +"%Y%m%d")-d-team_newifi-d2" > update_log.txt
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part3
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && PS_Firmware
-        echo "Artifacts_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
 
-    - name: Upload Firmware to Artifacts
+    - name: Upload AutoBuild Firmware to Artifacts
       uses: actions/upload-artifact@main
       if: env.UPLOAD_FIRMWARE == 'true' && !cancelled()
       with:
         name: OpenWrt_Firmware_${{ env.Artifacts_DATE }}
         path: openwrt/bin/Firmware
         
-    - name: Upload Firmware directory to Artifacts
+    - name: Upload bin directory to Artifacts
       uses: actions/upload-artifact@main
       if: env.UPLOAD_BIN_DIR == 'true' && !cancelled()
       with:
         name: OpenWrt_bin_${{ env.Artifacts_DATE }}
         path: openwrt/bin
 
-    - name: Upload Firmware to Releases
+    - name: Upload AutoBuild Firmware to Release
       uses: softprops/action-gh-release@v1
       if: env.UPLOAD_RELEASE == 'true' && !cancelled()
       env:
@@ -151,7 +150,7 @@ jobs:
         body_path: update_log.txt
         files: openwrt/bin/Firmware/*
         
-    - name: Remove old Releases
+    - name: Remove old Release
       uses: dev-drprasad/delete-older-releases@v0.1.0
       if: env.REMOVE_OLD_RELEASE == 'true' && !cancelled()
       with:

.github/workflows/x86_64.yml

@@ -25,7 +25,8 @@ on:
 
 env:
   REPO_URL: https://github.com/coolsnowwolf/lede
-  CONFIG_FILE: Configs/x86_64.config
+  REPO_BRANCH: master
+  CONFIG_FILE: x86_64
   DIY_SCRIPT: Scripts/AutoBuild_DiyScript.sh
   FUNCTION_SCRIPT: Scripts/AutoBuild_Function.sh
   UPLOAD_RELEASE: true
@@ -46,7 +47,7 @@ jobs:
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
-        echo "Deleting files, please wait ..."
+        echo "Deleting useless files, please wait ..."
         docker rmi `docker images -q`
         sudo rm -rf \
           /usr/share/dotnet \
@@ -74,32 +75,29 @@ jobs:
         sudo chown $USER:$GROUPS /workdir
         echo "Compile_Date=$(date +%Y%m%d)" > $GITHUB_WORKSPACE/Openwrt.info
         echo "Display_Date=$(date +'%Y/%m/%d')" >> $GITHUB_WORKSPACE/Openwrt.info
-        echo "## $(date +"%Y%m%d")-x86_64" > update_log.txt
+        echo "## $(date +"%Y%m%d")-$CONFIG_FILE" > update_log.txt
+        echo "Artifacts_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
 
-    - name: Clone Openwrt source code
+    - name: Clone source code
       run: |
-        git clone -b master $REPO_URL openwrt
+        git clone -b $REPO_BRANCH $REPO_URL openwrt
         ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
 
-    - name: Run Diy-Part1 Scripts
+    - name: Update & Install all feeds
-      run: |
-        chmod +x $DIY_SCRIPT
-        cd openwrt
-        source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part1
-
-    - name: Update & Install Feeds
       run: |
         cd openwrt
         ./scripts/feeds update -a
         ./scripts/feeds install -a
 
-    - name: Run Diy-Part2 Scripts
+    - name: Run [Firmware-Diy] Scripts
       run: |
-        [ -f $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config
+        chmod +x $DIY_SCRIPT
+        chmod +x $FUNCTION_SCRIPT
+        [ -f Configs/$CONFIG_FILE ] && mv Configs/$CONFIG_FILE openwrt/.config
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part2
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Firmware-Diy_Base
+        Firmware-Diy
 
     - name: SSH connection to Actions
       uses: P3TERX/ssh2actions@v1.0.0
@@ -111,6 +109,8 @@ jobs:
     - name: Download Packages
       run: |
         cd openwrt
+        ./scripts/feeds update -a
+        ./scripts/feeds install -a
         make defconfig
         make download -j$(nproc) V=s
         find dl -size -1024c -exec rm -f {} \;
@@ -120,28 +120,27 @@ jobs:
         cd openwrt
         make -j$(nproc) || make -j1 V=s
 
-    - name: Run Diy-Part3 Scripts
+    - name: Process the AutoBuild Firmware
       run: |
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
-        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part3
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && PS_Firmware
-        echo "Artifacts_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
 
-    - name: Upload Firmware to Artifacts
+    - name: Upload AutoBuild Firmware to Artifacts
       uses: actions/upload-artifact@main
       if: env.UPLOAD_FIRMWARE == 'true' && !cancelled()
       with:
         name: OpenWrt_Firmware_${{ env.Artifacts_DATE }}
         path: openwrt/bin/Firmware
         
-    - name: Upload Firmware directory to Artifacts
+    - name: Upload bin directory to Artifacts
       uses: actions/upload-artifact@main
       if: env.UPLOAD_BIN_DIR == 'true' && !cancelled()
       with:
         name: OpenWrt_bin_${{ env.Artifacts_DATE }}
         path: openwrt/bin
 
-    - name: Upload Firmware to Releases
+    - name: Upload AutoBuild Firmware to Release
       uses: softprops/action-gh-release@v1
       if: env.UPLOAD_RELEASE == 'true' && !cancelled()
       env:
@@ -151,7 +150,7 @@ jobs:
         body_path: update_log.txt
         files: openwrt/bin/Firmware/*
         
-    - name: Remove old Releases
+    - name: Remove old Release
       uses: dev-drprasad/delete-older-releases@v0.1.0
       if: env.REMOVE_OLD_RELEASE == 'true' && !cancelled()
       with:

Configs/d-team_newifi-d2

@@ -75,6 +75,7 @@ CONFIG_PACKAGE_luci-app-accesscontrol=y
 CONFIG_PACKAGE_luci-app-adbyby-plus=y
 CONFIG_PACKAGE_luci-app-adguardhome=y
 CONFIG_PACKAGE_luci-app-autoupdate=y
+CONFIG_PACKAGE_luci-app-bearDropper=y
 CONFIG_PACKAGE_luci-app-eqos=y
 CONFIG_PACKAGE_luci-app-filetransfer=y
 CONFIG_PACKAGE_luci-app-mwan3=y

CustomFiles/Depends/profile_lede

@@ -29,6 +29,7 @@ esac
 }
 
 Target=$([ -f /etc/openwrt_info ] && cat /etc/openwrt_info | awk 'NR==3')
+Version=$([ -f /etc/openwrt_info ] && cat /etc/openwrt_info | awk 'NR==1')
 [ -z "${Target}" ] && Target=$(jsonfilter -e '@.model.id' < /etc/board.json | tr ',' '_')
 IP_Address=$(ifconfig -a | grep inet | grep -v 127.0.0.1 | grep -v inet6 | awk '{print $2}' | tr -d "addr:" | awk 'NR==1')
 CoreMark=$([ -f /etc/bench.log ] && egrep -o "[0-9]+" /etc/bench.log | awk 'NR==1')
@@ -37,7 +38,8 @@ Srartup=$(awk '{a=$1/86400;b=($1%86400)/3600;c=($1%3600)/60} {printf("%d 天 %d
 Overlay_Available="$(df -h | grep ":/overlay" | awk '{print $4}' | awk 'NR==1')"
 
 echo -e "\n\n           设备名称:		${Target}"
-echo -e "           IP 地址: 		${IP_Address}"
+echo "           固件版本:		${Version}"
+echo "           IP 地址: 		${IP_Address}"
 echo "           运行时间: 		${Srartup}"
 echo "           CoreMark 得分: 	${CoreMark}"
 echo -e "           可用空间:		${Overlay_Available}\n"

Scripts/AutoBuild_DiyScript.sh

@@ -12,16 +12,8 @@ Diy_Core() {
 	INCLUDE_DRM_I915=true
 }
 
-Diy-Part1() {
+Firmware-Diy() {
-	Diy_Part1_Base
-
 	Update_Makefile exfat package/kernel/exfat
-}
-
-Diy-Part2() {
-	Diy_Part2_Base
-	ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
-
 	Replace_File CustomFiles/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
 	Replace_File CustomFiles/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
 	Replace_File CustomFiles/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
@@ -37,7 +29,3 @@ Diy-Part2() {
 	;;
 	esac
 }
-
-Diy-Part3() {
-	Diy_Part3_Base
-}

Scripts/AutoBuild_Function.sh

@@ -8,9 +8,9 @@ GET_TARGET_INFO() {
 	Home=${GITHUB_WORKSPACE}/openwrt
 	[ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info
 	Owner_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)"
-	AB_Firmware_Info=package/base-files/files/etc/openwrt_info
 	Source_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${Home}/.git/config | cut -c8-100)"
 	Source_Owner="$(echo "${Source_Repo}" | egrep -o "[a-z]+" | awk 'NR==4')"
+	AB_Firmware_Info=package/base-files/files/etc/openwrt_info
 	case ${Source_Owner} in
 	coolsnowwolf)
 		Version_File="package/lean/default-settings/files/zzz-default-settings"
@@ -50,45 +50,38 @@ GET_TARGET_INFO() {
 	TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)"
 }
 
-Diy_Part1_Base() {
+Firmware-Diy_Base() {
-	Diy_Core
+	GET_TARGET_INFO
 	Auto_ExtraPackages
 	chmod +x -R ${GITHUB_WORKSPACE}/Scripts
 	chmod +x -R ${GITHUB_WORKSPACE}/CustomFiles
 	if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then
 		Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
 	fi
-}
-
-Diy_Part2_Base() {
-	GET_TARGET_INFO
-	Replace_File CustomFiles/Depends/banner package/base-files/files/etc
-	sed -i "s?By?By ${Author}?g" package/base-files/files/etc/banner
 	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
-		AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}')
-		sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
-	else
-		sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
 	fi
-	Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
+	if [ -f package/base-files/files/bin/AutoUpdate.sh ];then
+		AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}')
+	else
+		AutoUpdate_Version=OFF
+	fi
+
 	case ${Source_Owner} in
 	coolsnowwolf)
+		Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
+		Replace_File CustomFiles/Depends/profile_lede package/base-files/files/etc profile
+		Replace_File CustomFiles/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 CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
-		Replace_File CustomFiles/Depends/profile_lede package/base-files/files/etc profile
-		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
+		[[ "${INCLUDE_DRM_I915}" == "true" ]] && Replace_File CustomFiles/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
@@ -96,10 +89,23 @@ Diy_Part2_Base() {
 		Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
 		sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" $Version_File
 	;;
-	*)
+	openwrt)
 		ExtraPackages git other luci-theme-argon https://github.com/jerrykuku
 	;;
 	esac
+	
+	case ${Source_Owner} in
+	immortalwrt)
+		Replace_File CustomFiles/Depends/banner package/lean/default-settings/files openwrt_banner
+		sed -i "s?By?By ${Author}?g" package/lean/default-settings/files/openwrt_banner
+		sed -i "s?Openwrt?ImmortalWrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/lean/default-settings/files/openwrt_banner
+	;;
+	*)
+		Replace_File CustomFiles/Depends/banner package/base-files/files/etc
+		sed -i "s?By?By ${Author}?g" package/base-files/files/etc/banner
+		sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
+	;;
+	esac
 
 	echo "${Openwrt_Version}" > ${AB_Firmware_Info}
 	echo "${Owner_Repo}" >> ${AB_Firmware_Info}
@@ -114,7 +120,7 @@ Diy_Part2_Base() {
 	echo "Source Github: ${Source_Repo}"
 }
 
-Diy_Part3_Base() {
+PS_Firmware() {
 	GET_TARGET_INFO
 	case ${Source_Owner} in
 	immortalwrt)