Skip to content

Commit

Permalink
knot-resolver: fix make config
Browse files Browse the repository at this point in the history
* Fix errors in make config preventing e.g. `menuconfig` from working,
  and `knot-resolver` from being included in builds

Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
facboy committed Jun 24, 2024
1 parent 2d711c8 commit 0ee46c7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
23 changes: 13 additions & 10 deletions net/knot-resolver/Config.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
menu "Configuration"
config PACKAGE_knot-resolver_dnstap
bool "Build with dnstap support"
default y
help
knot-resolver dnstap module supports logging DNS responses
to a unix socket in dnstap format using fstrm framing library.
This logging is useful if you need effectivelly log all
DNS traffic.
The unix socket and the socket reader must be present before
starting resolver instances.
depends on PACKAGE_knot-resolver

config PACKAGE_knot-resolver_dnstap
bool "Build with dnstap support"
default y
help
knot-resolver dnstap module supports logging DNS responses
to a unix socket in dnstap format using fstrm framing library.
This logging is useful if you need effectivelly log all
DNS traffic.
The unix socket and the socket reader must be present before
starting resolver instances.

endmenu
9 changes: 6 additions & 3 deletions net/knot-resolver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=knot-resolver
PKG_VERSION:=5.7.1
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
Expand All @@ -21,6 +21,9 @@ PKG_MAINTAINER:=Jan Pavlinec <[email protected]>
PKG_LICENSE:=GPL-3.0-later
PKG_LICENSE_FILES:=COPYING

PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_knot-resolver_dnstap

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk

Expand All @@ -40,8 +43,8 @@ define Package/knot-resolver
+libstdcpp \
+libnghttp2 \
+lmdb \
PACKAGE_knot-resolver_dnstap:libfstrm \
PACKAGE_knot-resolver_dnstap:libprotobuf-c
+PACKAGE_knot-resolver_dnstap:libfstrm \
+PACKAGE_knot-resolver_dnstap:libprotobuf-c
USERID:=kresd=3536:kresd=3536
endef

Expand Down

0 comments on commit 0ee46c7

Please sign in to comment.