cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

stubby: makefile and init script cleanup

Browse Source 
Reordered Makefile according to
https://github.com/openwrt/packages/pull/9399#issuecomment-508727872 .

Added PKG_BUILD_PARALLEL for faster compilation.

Remove duplicated conffiles section.

Install /etc/config/stubby using INSTALL_CONF, as is done elsewhere

Run init script through shellcheck and clean it up.

Added chmod for the stubby config file, to fix a LuCI issue.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-02-21 15:26:34 -08:00
parent 552c9ec87a
commit eaf5225323
2 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/stubby/Makefile
+19 -25
View File
@@ -6,46 +6,46 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=stubby
PKG_VERSION:=0.2.6
PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jonathan Underwood <jonathan.underwood@gmail.com>
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME)
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MIRROR_HASH:=af896c471ac67b31c2263d11fcdfcdb32a213621c2f8789f4b0a4ceca4437108
PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Jonathan Underwood <jonathan.underwood@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/stubby/Default
TITLE:=stubby
URL:=https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby
TITLE:=stubby
URL:=https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby
endef
define Package/stubby
$(call Package/stubby/Default)
SECTION:=net
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE+= - (daemon that uses getdns)
USERID:=stubby=410:stubby=410
DEPENDS:= +libyaml +getdns +ca-certs
$(call Package/stubby/Default)
SECTION:=net
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE+= - (daemon that uses getdns)
USERID:=stubby=410:stubby=410
DEPENDS:= +libyaml +getdns +ca-certs
endef
define Package/stubby/description
This package contains the Stubby daemon (which utilizes the getdns library).
See https://github.com/openwrt/packages/blob/master/net/stubby/files/README.md for more details.
This package contains the Stubby daemon (which utilizes the getdns library).
See https://github.com/openwrt/packages/blob/master/net/stubby/files/README.md for more details.
endef
define Package/stubby/conffiles
/etc/stubby/stubby.yml
/etc/config/stubby
endef
define Package/stubby/install
@@ -57,13 +57,7 @@ define Package/stubby/install
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/stubby/stubby.yml $(1)/etc/stubby/stubby.yml.default
$(INSTALL_DATA) ./files/stubby.yml $(1)/etc/stubby/stubby.yml
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/stubby.conf $(1)/etc/config/stubby
endef
define Package/stubby/conffiles
/etc/stubby/stubby.yml
/etc/config/stubby
$(INSTALL_CONF) ./files/stubby.conf $(1)/etc/config/stubby
endef
$(eval $(call BuildPackage,stubby))