From 4746dd31eaeb302938b13ea1912b9d03d0852c06 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 14 Dec 2019 19:54:04 +0800 Subject: [PATCH] AdGuardHome: update download way --- package/jsda/AdGuardHome/Makefile | 44 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/package/jsda/AdGuardHome/Makefile b/package/jsda/AdGuardHome/Makefile index 9f1555fb19..8be53cd184 100644 --- a/package/jsda/AdGuardHome/Makefile +++ b/package/jsda/AdGuardHome/Makefile @@ -7,21 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=AdGuardHome -PKG_VERSION:=v0.99.3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Network-wide ads & trackers blocking DNS server - URL:=https://github.com/AdguardTeam/AdGuardHome -endef - -define Package/$(PKG_NAME)/description - Network-wide ads & trackers blocking DNS server -endef +PKG_VERSION:=snapshot +PKG_RELEASE:=d9ee9b8 ifeq ($(ARCH),x86_64) PKG_ARCH_AdGuardHome:=linux_amd64 @@ -40,7 +27,11 @@ ifeq ($(ARCH),mips) ADG_CONF_NAME:=small_flash endif ifeq ($(ARCH),arm) - PKG_ARCH_AdGuardHome:=linux_arm +ifeq ($(BOARD),bcm53xx) + PKG_ARCH_AdGuardHome:=linux_arm5 +else + PKG_ARCH_AdGuardHome:=linux_arm7 +endif ADG_CONF_NAME:=big_space endif ifeq ($(ARCH),aarch64) @@ -48,10 +39,21 @@ ifeq ($(ARCH),aarch64) ADG_CONF_NAME:=big_space endif +PKG_SOURCE:=AdGuardHome_$(PKG_ARCH_AdGuardHome).tar.gz +PKG_SOURCE_URL:=https://package.project-openwrt.eu.org/package/network/services/AdGuardHome/d9ee9b8/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) +PKG_HASH:=skip + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=Network-wide ads & trackers blocking DNS server + URL:=https://github.com/AdguardTeam/AdGuardHome +endef + define Build/Prepare - [ ! -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 @@ -63,11 +65,7 @@ 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 $(INSTALL_CONF) ./files/conf/$(ADG_CONF_NAME).yaml $(1)/etc/AdGuardHome/AdGuardHome.yaml endef