[package] dnsmasq: add missing config_get, localize variables, bump package revision

[openwrt.git] / package / dnsmasq / Makefile

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 76b1ac0..9fc70b3 100644 (file)
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -1,35 +1,58 @@
-# $Id$
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq

-PKG_VERSION:=2.27
-PKG_RELEASE:=1
+PKG_VERSION:=2.59
+PKG_RELEASE:=3

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 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:=489198ec87101087043adc98bbe062dc
-PKG_CAT:=zcat
+PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6

 
 

-include $(TOPDIR)/package/rules.mk
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk

 
 define Package/dnsmasq
 
 define Package/dnsmasq

-SECTION:=base
-CATEGORY:=Network
-DEFAULT:=y
-TITLE:=A lightweight DNS and DHCP server
-DESCRIPTION:=A lightweight DNS and DHCP server.  It is intended to provide \\\
-coupled DNS and DHCP service to a LAN.
-URL:=http://www.thekelleys.org.uk/dnsmasq/
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=A lightweight DNS and DHCP server
+  URL:=http://www.thekelleys.org.uk/dnsmasq/
+endef
+
+define Package/dnsmasq/description
+  It is intended to provide coupled DNS and DHCP service to a LAN.

 endef
 
 endef
 

+define Package/dnsmasq/conffiles
+/etc/config/dhcp
+/etc/dnsmasq.conf
+endef
+
+TARGET_CFLAGS += \
+       -ffunction-sections -fdata-sections \
+       $(if $(CONFIG_IPV6),,-DNO_IPV6)
+
+MAKE_FLAGS := \
+       $(TARGET_CONFIGURE_OPTS) \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       LDFLAGS="-Wl,--gc-sections" \
+       PREFIX="/usr"
+

 define Package/dnsmasq/install
 define Package/dnsmasq/install

-       install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin
-       install -m0755 -d $(IDIR_DNSMASQ)/etc/init.d/
-       install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/
-       install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
-       install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
+       $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq

 endef
 
 $(eval $(call BuildPackage,dnsmasq))
 endef
 
 $(eval $(call BuildPackage,dnsmasq))