From 0178b5271343918e2e2f68b66d0b8035a1db5f17 Mon Sep 17 00:00:00 2001
From: xopenwrt <98641952+xopenwrt@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:21:01 +0800
Subject: [PATCH] replace AdguardHome

---
 .github/workflows/X-x86_64_X.yml      | 1 +
 .github/workflows/X-x86_64_X_Mine.yml | 1 +
 .github/workflows/X-x86_64_Y.yml      | 1 +
 .github/workflows/X-x86_64_Z.yml      | 1 +
 .github/workflows/X-x86_64_Z_Mine.yml | 1 +
 Scripts/AutoBuild_DiyScript.sh        | 2 +-
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml
index f05a785..bd5cf95 100644
--- a/.github/workflows/X-x86_64_X.yml
+++ b/.github/workflows/X-x86_64_X.yml
@@ -192,6 +192,7 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm package/feeds/packages/net/adguardhome -rf
         make -j4 || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
diff --git a/.github/workflows/X-x86_64_X_Mine.yml b/.github/workflows/X-x86_64_X_Mine.yml
index ed84e8b..1b531f3 100644
--- a/.github/workflows/X-x86_64_X_Mine.yml
+++ b/.github/workflows/X-x86_64_X_Mine.yml
@@ -192,6 +192,7 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm package/feeds/packages/net/adguardhome -rf
         make -j8 || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml
index 4c5ad6f..46cf235 100644
--- a/.github/workflows/X-x86_64_Y.yml
+++ b/.github/workflows/X-x86_64_Y.yml
@@ -191,6 +191,7 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm package/feeds/packages/net/adguardhome -rf
         make -j4 || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
diff --git a/.github/workflows/X-x86_64_Z.yml b/.github/workflows/X-x86_64_Z.yml
index 1d46e17..c0137b3 100644
--- a/.github/workflows/X-x86_64_Z.yml
+++ b/.github/workflows/X-x86_64_Z.yml
@@ -190,6 +190,7 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm package/feeds/packages/net/adguardhome -rf
         make -j4 || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
diff --git a/.github/workflows/X-x86_64_Z_Mine.yml b/.github/workflows/X-x86_64_Z_Mine.yml
index 78b6982..1f0b176 100644
--- a/.github/workflows/X-x86_64_Z_Mine.yml
+++ b/.github/workflows/X-x86_64_Z_Mine.yml
@@ -192,6 +192,7 @@ jobs:
     - name: Build OpenWrt
       run: |
         cd openwrt
+        rm package/feeds/packages/net/adguardhome -rf
         make -j8 || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index 094cfad..b2118a1 100755
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -97,7 +97,7 @@ EOF
 		#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}
 		# delete adguardhome in lede package
-		rm ${FEEDS_PKG}/net/adguardhome -rf
+		# rm package/feeds/packages/net/adguardhome -rf
 
 		case "${TARGET_BOARD}" in
 		ramips)