summaryrefslogtreecommitdiff
path: root/package/dnsmasq
diff options
context:
space:
mode:
Diffstat (limited to 'package/dnsmasq')
-rw-r--r--package/dnsmasq/Makefile10
-rw-r--r--package/dnsmasq/files/dnsmasq.conffiles (renamed from package/dnsmasq/ipkg/dnsmasq.conffiles)0
-rw-r--r--package/dnsmasq/files/dnsmasq.init13
-rw-r--r--package/dnsmasq/files/dnsmasq.postinst (renamed from package/dnsmasq/ipkg/dnsmasq.postinst)0
-rw-r--r--package/dnsmasq/ipkg/dnsmasq.control4
5 files changed, 13 insertions, 14 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index ba09c4e95..10fb0b247 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:= dnsmasq
PKG_VERSION:= 2.47
PKG_RELEASE:= 1
PKG_MD5SUM:= 4524081e56d0b935717d493e8e8d3e11
-MASTER_SITES:= http://thekelleys.org.uk/dnsmasq/
+PKG_DESCR:= A lightweight DNS and DHCP server
+PKG_SECTION:= net
+PKG_URL:= http://thekelleys.org.uk/dnsmasq
+PKG_SITES:= http://thekelleys.org.uk/dnsmasq/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
BUILD_STYLE:= auto
INSTALL_STYLE= manual
@@ -23,9 +26,8 @@ MAKE_FLAGS+= COPTS="${TCFLAGS} -DNO_IPV6"
endif
do-install:
- ${INSTALL_DIR} ${IDIR_DNSMASQ}/{etc/init.d,usr/sbin}
+ ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc
${INSTALL_BIN} ${WRKBUILD}/src/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/
${INSTALL_DATA} files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf
- ${INSTALL_BIN} files/dnsmasq.init ${IDIR_DNSMASQ}/etc/init.d/dnsmasq
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/files/dnsmasq.conffiles
index e30eba8f6..e30eba8f6 100644
--- a/package/dnsmasq/ipkg/dnsmasq.conffiles
+++ b/package/dnsmasq/files/dnsmasq.conffiles
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index e92ad3acc..be9218bcb 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -1,10 +1,11 @@
#!/bin/sh
-#FWINIT 50
+#PKG dnsmasq
+#INIT 50
. /etc/rc.conf
case $1 in
-(autostop) ;;
-(autostart)
+autostop) ;;
+autostart)
[[ $dns_dhcp = NO ]] && exit 0
exec sh $0 start
;;
@@ -12,14 +13,14 @@ start)
[ -f /etc/dnsmasq.conf ] || exit
/usr/sbin/dnsmasq
;;
-(stop)
+stop)
killall dnsmasq
;;
-(restart)
+restart)
sh $0 stop
sh $0 start
;;
-(*)
+*)
echo "Usage: $0 {start | stop | restart}"
;;
esac
diff --git a/package/dnsmasq/ipkg/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst
index f2ff69e58..f2ff69e58 100644
--- a/package/dnsmasq/ipkg/dnsmasq.postinst
+++ b/package/dnsmasq/files/dnsmasq.postinst
diff --git a/package/dnsmasq/ipkg/dnsmasq.control b/package/dnsmasq/ipkg/dnsmasq.control
deleted file mode 100644
index 6f61edc65..000000000
--- a/package/dnsmasq/ipkg/dnsmasq.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dnsmasq
-Priority: essential
-Section: net
-Description: A lightweight DNS and DHCP server