On Mon, Jun 16, 2014 at 09:57:20AM +0200, Andre Heider wrote: > Hi, > > On Sun, Jun 15, 2014 at 12:26 AM, Yousong Zhou <yszhou4t...@gmail.com> wrote: > > It will be more complete if dnsmasq-dhcpv6 is also covered by this > > config option. Even better is letting this option depend on the > > actual dnsmasq build variant selected. > > As mentioned in the cover letter: while the config option shows up > between dnsmasq and dnsmasq-dhcpv6, it already influences both. > > I'm not sure how the configuration should look like... > A submenu per variant? (your suggestion of 'letting this option depend > on the actual dnsmasq build variant' sounds like that is what you > mean?) > A submenu below the variants to configure them all? > > In any case, I'm not sure how to solve that ;) Can you point me to an > example or documentation how to express that?
I have the following sitting in my local tree for enabling ipset support of dnsmasq. But I am not sure how this should be adapted to get merged into the trunk if build variants are preferred over config options in the case of dnsmasq. +define Package/dnsmasq/config/Default + if PACKAGE_$(1) + config PACKAGE_dnsmasq_$(2)_ipset + bool "Build with ipset support." + default n + config PACKAGE_dnsmasq_$(2)_auth + bool "Build with the facility to act as an authoritative DNS server." + default n + endif +endef + +Package/dnsmasq/config=$(call Package/dnsmasq/config/Default,dnsmasq,nodhcpv6) +Package/dnsmasq-dhcpv6/config=$(call Package/dnsmasq/config/Default,dnsmasq-dhcpv6,dhcpv6) + Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles) TARGET_CFLAGS += \ -ffunction-sections -fdata-sections \ - $(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH + $(if $(CONFIG_IPV6),,-DNO_IPV6) \ + $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET) \ + $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth),,-DNO_AUTH) Regards. yousong _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel