diff options
author | Markus Pargmann <mpa@pengutronix.de> | 2014-05-08 10:00:35 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-05-08 17:45:35 +0200 |
commit | 1967b3f3b441e5f05e52fd75e900b9a13c4b5492 (patch) | |
tree | 69154e87352fee1b0905bc52074c6e28c9d990b4 /rules/dnsmasq.make | |
parent | 2c2f05ba1b5e62c907da02736efe2697c454b4ae (diff) | |
download | ptxdist-1967b3f3b441e5f05e52fd75e900b9a13c4b5492.tar.gz ptxdist-1967b3f3b441e5f05e52fd75e900b9a13c4b5492.tar.xz |
dnsmasq: version bump 2.47 -> 2.70
The newer version of dnsmasq now includes IPv6 router advertisement
support. This patch also changes to tar.xz.
Some new compile time options are added, including DNSSEC support.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dnsmasq.make')
-rw-r--r-- | rules/dnsmasq.make | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index 675bf5c91..9189c332c 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq # # Paths and names # -DNSMASQ_VERSION := 2.47 -DNSMASQ_MD5 := 4524081e56d0b935717d493e8e8d3e11 +DNSMASQ_VERSION := 2.70 +DNSMASQ_MD5 := 1d654e80888ab5dbba015548fd284d46 DNSMASQ := dnsmasq-$(DNSMASQ_VERSION) -DNSMASQ_SUFFIX := tar.gz +DNSMASQ_SUFFIX := tar.xz DNSMASQ_URL := http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX) DNSMASQ_SOURCE := $(SRCDIR)/$(DNSMASQ).$(DNSMASQ_SUFFIX) DNSMASQ_DIR := $(BUILDDIR)/$(DNSMASQ) @@ -38,10 +38,27 @@ DNSMASQ_COPT := ifndef PTXCONF_DNSMASQ_TFTP DNSMASQ_COPT += -DNO_TFTP endif + ifndef PTXCONF_GLOBAL_IPV6 DNSMASQ_COPT += -DNO_IPV6 endif +ifndef PTXCONF_DNSMASQ_DHCP +DNSMASQ_COPT += -DNO_DHCP +else +ifndef PTXCONF_DNSMASQ_SCRIPT +DNSMASQ_COPT += -DNO_SCRIPT +else +ifndef PTXCONF_DNSMASQ_SCRIPT_LUA +DNSMASQ_COPT += -DHAVE_LUASCRIPT +endif +endif +endif + +ifdef DNSMASQ_DNSSEC +DNSMASQ_COPT += -DHAVE_DNSSEC +endif + DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)' $(STATEDIR)/dnsmasq.prepare: |