knot-resolver: fix make config

* Fix errors in make config preventing e.g. `menuconfig` from working, and `knot-resolver` from being included in builds * Disable `dnstap` by default as the docker build images do not have `protobuf-c-compiler` installed, so the build fails Signed-off-by: Christopher Ng <[email protected]>
openwrt · Sep 17, 2024 · 2deda3e · 2deda3e
1 parent 180046b
commit 2deda3e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/net/knot-resolver/Config.in b/net/knot-resolver/Config.in
@@ -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 n
+	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
diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile
@@ -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
@@ -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
 
@@ -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