diff --git a/adguardhome/Makefile b/adguardhome/Makefile index d8961e3..db3eedc 100644 --- a/adguardhome/Makefile +++ b/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.13 -PKG_RELEASE:=65 +PKG_VERSION:=0.107.35 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=77d04d44eb080500f79e1329f943decb976d1817 +PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=skip +PKG_MIRROR_HASH:=5b21b3ebf396f95a31f9bde6066c98c1329a3faa1aa2fda61c877e1de4244ea5 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt @@ -22,15 +22,13 @@ PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -PKG_CONFIG_DEPENDS:=CONFIG_ADGUARDHOME_COMPRESS_GOPROXY - GO_PKG:=github.com/AdguardTeam/AdGuardHome GO_PKG_BUILD_PKG:=github.com/AdguardTeam/AdGuardHome AGH_BUILD_TIME:=$(shell date -d @$(SOURCE_DATE_EPOCH) +%FT%TZ%z) AGH_VERSION_PKG:=github.com/AdguardTeam/AdGuardHome/internal/version GO_PKG_LDFLAGS_X:=$(AGH_VERSION_PKG).channel=release \ - $(AGH_VERSION_PKG).version=v$(PKG_VERSION) \ + $(AGH_VERSION_PKG).version=$(PKG_SOURCE_VERSION) \ $(AGH_VERSION_PKG).buildtime=$(AGH_BUILD_TIME) \ $(AGH_VERSION_PKG).goarm=$(GO_ARM) \ $(AGH_VERSION_PKG).gomips=$(GO_MIPS) @@ -55,17 +53,6 @@ define Package/adguardhome/description Free and open source, powerful network-wide ads and trackers blocking DNS server. endef -define Package/$(PKG_NAME)/config -config ADGUARDHOME_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n -endef - -ifeq ($(CONFIG_ADGUARDHOME_COMPRESS_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.bj.bcebos.com -endif - define Build/Compile ( \ pushd $(PKG_BUILD_DIR) ; \ @@ -75,14 +62,5 @@ define Build/Compile ) endef -define Package/adguardhome/install - $(call GoPackage/Package/Install/Bin,$(1)) - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome -endef - $(eval $(call GoBinPackage,adguardhome)) $(eval $(call BuildPackage,adguardhome))