projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] dnsmasq: Bump to 2.62, add DHCPv6 variant
[openwrt/svn-archive/archive.git]
/
package
/
dnsmasq
/
Makefile
diff --git
a/package/dnsmasq/Makefile
b/package/dnsmasq/Makefile
index 10f1806dd36021a06d904a20cf294a4889672016..f19e0126358f995f617452cede7403ecce374ae8 100644
(file)
--- a/
package/dnsmasq/Makefile
+++ b/
package/dnsmasq/Makefile
@@
-8,37
+8,63
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.
59
-PKG_RELEASE:=
4
+PKG_VERSION:=2.
62
+PKG_RELEASE:=
1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6
+PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-define Package/dnsmasq
+define Package/dnsmasq
/Default
SECTION:=net
CATEGORY:=Base system
TITLE:=A lightweight DNS and DHCP server
URL:=http://www.thekelleys.org.uk/dnsmasq/
endef
SECTION:=net
CATEGORY:=Base system
TITLE:=A lightweight DNS and DHCP server
URL:=http://www.thekelleys.org.uk/dnsmasq/
endef
+define Package/dnsmasq
+$(call Package/dnsmasq/Default)
+ VARIANT:=nodhcpv6
+endef
+
+define Package/dnsmasq-dhcpv6
+$(call Package/dnsmasq/Default)
+ TITLE += (with DHCPv6 support)
+ DEPENDS:=@IPV6 +kmod-ipv6
+ VARIANT:=dhcpv6
+endef
+
define Package/dnsmasq/description
It is intended to provide coupled DNS and DHCP service to a LAN.
endef
define Package/dnsmasq/description
It is intended to provide coupled DNS and DHCP service to a LAN.
endef
+define Package/dnsmasq-dhcpv6/description
+$(call Package/dnsmasq/description)
+
+This is a variant with DHCPv6 support
+endef
+
define Package/dnsmasq/conffiles
/etc/config/dhcp
/etc/dnsmasq.conf
endef
define Package/dnsmasq/conffiles
/etc/config/dhcp
/etc/dnsmasq.conf
endef
+Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
+
TARGET_CFLAGS += \
-ffunction-sections -fdata-sections \
$(if $(CONFIG_IPV6),,-DNO_IPV6)
TARGET_CFLAGS += \
-ffunction-sections -fdata-sections \
$(if $(CONFIG_IPV6),,-DNO_IPV6)
+ifeq ($(BUILD_VARIANT),nodhcpv6)
+ TARGET_CFLAGS += -DNO_DHCP6
+endif
+
MAKE_FLAGS := \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
MAKE_FLAGS := \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@
-55,4
+81,7
@@
define Package/dnsmasq/install
$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
endef
$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
endef
+Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
+
$(eval $(call BuildPackage,dnsmasq))
$(eval $(call BuildPackage,dnsmasq))
+$(eval $(call BuildPackage,dnsmasq-dhcpv6))