diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/dnsmasq | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/dnsmasq')
| -rw-r--r-- | package/dnsmasq/Config.in | 11 | ||||
| -rw-r--r-- | package/dnsmasq/Makefile | 12 | ||||
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.init | 2 |
3 files changed, 6 insertions, 19 deletions
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in deleted file mode 100644 index 0fd2a5ce0..000000000 --- a/package/dnsmasq/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_PACKAGE_DNSMASQ - prompt "dnsmasq........................... Lightweight DNS and DHCP server" - tristate - default n - help - A lightweight DNS and DHCP server. It is intended to - provide coupled DNS and DHCP service to a LAN. Dnsmasq - supports static and dynamic DHCP leases and BOOTP/TFTP for - network booting of diskless machines. - - http://www.thekelleys.org.uk/dnsmasq/ diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 0cfa55f25..8bcb361f9 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.49 +PKG_VERSION:= 2.51 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7ccc861d8a733474f9c0a0a127006ee9 +PKG_MD5SUM:= 97465261a6de5258a3c3edfe51ca16a4 PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= net PKG_URL:= http://thekelleys.org.uk/dnsmasq @@ -16,12 +16,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -BUILD_STYLE:= auto -INSTALL_STYLE= manual +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + MAKE_FLAGS+= BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}" -ifneq ($(ADK_IPV6),y) -MAKE_FLAGS+= COPTS="${TCFLAGS} -DNO_IPV6" -endif do-install: ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index be9218bcb..01ca2cca6 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -14,7 +14,7 @@ start) /usr/sbin/dnsmasq ;; stop) - killall dnsmasq + pkill dnsmasq ;; restart) sh $0 stop |