Migrate to dnsmasq-full to restore query caching

We migrate to dnsmasq-full, while disabling most of its features.
Notably, dhcp and dnssec are compiled in, while other features of the
full variant are deselected.
This commit is contained in:
Martin Weinelt 2023-01-15 20:41:39 +01:00
parent acfd3f1744
commit 86502c46ba
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
3 changed files with 12 additions and 2 deletions

View File

@ -9,7 +9,7 @@ include ../gluon.mk
define Package/gluon-setup-mode define Package/gluon-setup-mode
TITLE:=Setup mode TITLE:=Setup mode
DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq-full
endef endef
define Package/gluon-setup-mode/description define Package/gluon-setup-mode/description

View File

@ -6,7 +6,7 @@ include ../gluon.mk
define Package/gluon-wan-dnsmasq define Package/gluon-wan-dnsmasq
TITLE:=Support for a secondary DNS server using the WAN interface TITLE:=Support for a secondary DNS server using the WAN interface
DEPENDS:=+gluon-core +libubus-lua +dnsmasq +libpacketmark DEPENDS:=+gluon-core +libubus-lua +dnsmasq-full +libpacketmark
endef endef
define Package/gluon-wan-dnsmasq/description define Package/gluon-wan-dnsmasq/description

View File

@ -42,6 +42,15 @@ try_config('PACKAGE_usbip', false) -- fails to build
try_config('PACKAGE_ATH_DEBUG', true) try_config('PACKAGE_ATH_DEBUG', true)
try_config('PACKAGE_dnsmasq_full_dhcpv6', false)
try_config('PACKAGE_dnsmasq_full_auth', false)
try_config('PACKAGE_dnsmasq_full_ipset', false)
try_config('PACKAGE_dnsmasq_full_nftset', false)
try_config('PACKAGE_dnsmasq_full_conntrack', false)
try_config('PACKAGE_dnsmasq_full_noid', false)
try_config('PACKAGE_dnsmasq_full_broken_rtc', false)
try_config('PACKAGE_dnsmasq_full_rtc', false)
try_config('TARGET_SQUASHFS_BLOCK_SIZE', 256) try_config('TARGET_SQUASHFS_BLOCK_SIZE', 256)
config('KERNEL_PROC_STRIPPED', true) config('KERNEL_PROC_STRIPPED', true)
@ -81,6 +90,7 @@ config('GLUON_MINIFY', istrue(env.GLUON_MINIFY))
packages { packages {
'-ca-bundle', '-ca-bundle',
'-dnsmasq',
'-kmod-ipt-offload', '-kmod-ipt-offload',
'-kmod-nft-offload', '-kmod-nft-offload',
'-libustream-wolfssl', '-libustream-wolfssl',