From 3eda094fc53a6fdd95db620b1dda3ea9c4e4dadf Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 5 Oct 2019 00:27:22 +0800
Subject: [PATCH] AdGuardHome: fix make

---
 package/jsda/AdGuardHome/Makefile | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/package/jsda/AdGuardHome/Makefile b/package/jsda/AdGuardHome/Makefile
index c7e55c2f3d..09871b264c 100644
--- a/package/jsda/AdGuardHome/Makefile
+++ b/package/jsda/AdGuardHome/Makefile
@@ -21,7 +21,7 @@ define Package/$(PKG_NAME)
 endef
 
 define Package/$(PKG_NAME)/description
-AdGuardHome
+	AdGuardHome
 endef
 
 ifeq ($(ARCH),x86_64)
@@ -40,37 +40,33 @@ ifeq ($(ARCH),arm)
 	PKG_ARCH_AdGuardHome:=linux_arm
 endif
 ifeq ($(ARCH),aarch64)
-	PKG_ARCH_AdGuardHome:=linux_amd64
+	PKG_ARCH_AdGuardHome:=linux_arm64
 endif
 
 define Build/Prepare
-	ifeq ($(BOARD),bcm53xx)
-		mkdir -p $(PKG_BUILD_DIR)/AdGuardHome
-		$(CP) -f ./files/bin/adg_bcm53xx $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
-	else
-		[ ! -f $(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz ] && wget https://github.com/AdguardTeam/AdGuardHome/releases/download/$(PKG_VERSION)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz -O $(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz
-		$(RM) -rf $(PKG_BUILD_DIR)/AdGuardHome
-		tar -xzvf $(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz -C $(PKG_BUILD_DIR)
-	endif
+	[ ! -e "$(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz" ] && curl --location https://github.com/AdguardTeam/AdGuardHome/releases/download/$(PKG_VERSION)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz -o $(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz
+	$(RM) $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
+	tar -xzf $(PKG_BUILD_DIR)/AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz -C $(PKG_BUILD_DIR)
+
 endef
 
 define Build/Configure
 endef
 
 define Build/Compile
-	ifeq ($(BOARD),bcm53xx)
-		chmod 0755 $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome 
-	else
-		chmod 0755 $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
-		upx --lzma $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
-	endif
+	chmod 0755 $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
+	upx --lzma $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome
 endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
+ifeq ($(BOARD),bcm53xx)
+	$(INSTALL_BIN) ./files/bin/adg_bcm53xx $(1)/usr/bin/AdGuardHome
+else
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome $(1)/usr/bin/AdGuardHome
+endif
 	$(INSTALL_DIR) $(1)/etc/AdGuardHome
-	$(CP) -fpR ./files/etc/AdGuardHome $(1)/etc
+	$(CP) ./files/etc/AdGuardHome $(1)/etc
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))