fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL 2020-07-23 17:25:14 +08:00
commit 15871ca98e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
package/ctcgfw/luci-app-adguardhome/Makefile
View File

@ -8,45 +8,26 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-adguardhome
PKG_VERSION:=1.8
PKG_RELEASE:=11
PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
LUCI_TITLE:=LuCI app for AdGuardHome
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+ca-certs +curl +wget +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome
LUCI_DESCRIPTION:=LuCI support for AdGuardHome
include $(INCLUDE_DIR)/package.mk
define Package/luci-app-adguardhome
SECTION:=luci
CATEGORY:=LuCI
SUBMENU:=3. Applications
TITLE:=LuCI app for adguardhome
PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
PKGARCH:=all
DEPENDS:=+!wget&&!curl:wget
define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_binary
bool "Include Binary File"
default y
endef
define Package/luci-app-adguardhome/description
LuCI support for adguardhome
endef
define Build/Prepare
endef
define Build/Compile
endef
PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary
define Package/luci-app-adguardhome/conffiles
/usr/share/AdGuardHome/links.txt
/etc/config/AdGuardHome
endef
define Package/luci-app-adguardhome/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci
cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
$(INSTALL_DIR) $(1)/
cp -pR ./root/* $(1)/
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
po2lmo ./po/zh-cn/AdGuardHome.po $(1)/usr/lib/lua/luci/i18n/AdGuardHome.zh-cn.lmo
endef
define Package/luci-app-adguardhome/postinst
#!/bin/sh
/etc/init.d/AdGuardHome enable >/dev/null 2>&1
@ -72,4 +53,6 @@ fi
exit 0
endef
$(eval $(call BuildPackage,luci-app-adguardhome))
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

1
package/ctcgfw/msgpack-c/Makefile
View File

@ -43,7 +43,6 @@ endef
define Package/libmsgpack-c
$(call Package/msgpack-c)
TITLE+= (Libraries)
VARIANT:=lib
endef
define Package/msgpack-c/description

4
package/ntlf9t/AdGuardHome/Makefile
View File

@ -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))