From dda2d05a590ef103b54937b4b4c9b19d44e8c7c8 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 23 Jul 2020 17:15:35 +0800 Subject: [PATCH] AdGuardHome: support luci-app-adguardhome --- package/ctcgfw/luci-app-adguardhome/Makefile | 14 +++++++++++--- package/ntlf9t/AdGuardHome/Makefile | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile index f3b3c35589..4e74bb9290 100644 --- a/package/ctcgfw/luci-app-adguardhome/Makefile +++ b/package/ctcgfw/luci-app-adguardhome/Makefile @@ -17,16 +17,24 @@ define Package/luci-app-adguardhome SECTION:=luci CATEGORY:=LuCI SUBMENU:=3. Applications - TITLE:=LuCI app for adguardhome + TITLE:=LuCI app for AdGuardHome PKG_MAINTAINER:= PKGARCH:=all - DEPENDS:=+!wget&&!curl:wget + DEPENDS:=+ca-certs +curl +wget +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome endef define Package/luci-app-adguardhome/description - LuCI support for adguardhome + LuCI support for AdGuardHome endef +define Package/$(PKG_NAME)/config +config PACKAGE_$(PKG_NAME)_INCLUDE_binary + bool "Include Binary File" + default y +endef + +PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary + define Build/Prepare endef diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile index 4d77bcd39d..0244ff7a66 100644 --- a/package/ntlf9t/AdGuardHome/Makefile +++ b/package/ntlf9t/AdGuardHome/Makefile @@ -55,7 +55,9 @@ define Build/Compile endef define Package/AdGuardHome/install - $(call GoPackage/Package/Install/Bin,$(1)) + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(INSTALL_DIR) $(1)/usr/bin/AdGuardHome + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome $(1)/usr/bin/AdGuardHome/AdGuardHome endef $(eval $(call GoBinPackage,AdGuardHome))