From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/dnsmasq/Makefile                | 10 ++++++----
 package/dnsmasq/files/dnsmasq.conffiles |  1 +
 package/dnsmasq/files/dnsmasq.init      | 13 +++++++------
 package/dnsmasq/files/dnsmasq.postinst  |  7 +++++++
 package/dnsmasq/ipkg/dnsmasq.conffiles  |  1 -
 package/dnsmasq/ipkg/dnsmasq.control    |  4 ----
 package/dnsmasq/ipkg/dnsmasq.postinst   |  7 -------
 7 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 package/dnsmasq/files/dnsmasq.conffiles
 create mode 100644 package/dnsmasq/files/dnsmasq.postinst
 delete mode 100644 package/dnsmasq/ipkg/dnsmasq.conffiles
 delete mode 100644 package/dnsmasq/ipkg/dnsmasq.control
 delete mode 100644 package/dnsmasq/ipkg/dnsmasq.postinst

(limited to 'package/dnsmasq')

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/files/dnsmasq.conffiles b/package/dnsmasq/files/dnsmasq.conffiles
new file mode 100644
index 000000000..e30eba8f6
--- /dev/null
+++ b/package/dnsmasq/files/dnsmasq.conffiles
@@ -0,0 +1 @@
+/etc/dnsmasq.conf
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/files/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst
new file mode 100644
index 000000000..f2ff69e58
--- /dev/null
+++ b/package/dnsmasq/files/dnsmasq.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+
+gid=$(get_next_gid)
+add_user dnsmasq $(get_next_uid) $gid /tmp
+add_group dnsmasq $gid
+add_rcconf dnsmasq dns_dhcp NO
diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/ipkg/dnsmasq.conffiles
deleted file mode 100644
index e30eba8f6..000000000
--- a/package/dnsmasq/ipkg/dnsmasq.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/dnsmasq.conf
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
diff --git a/package/dnsmasq/ipkg/dnsmasq.postinst b/package/dnsmasq/ipkg/dnsmasq.postinst
deleted file mode 100644
index f2ff69e58..000000000
--- a/package/dnsmasq/ipkg/dnsmasq.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-
-gid=$(get_next_gid)
-add_user dnsmasq $(get_next_uid) $gid /tmp
-add_group dnsmasq $gid
-add_rcconf dnsmasq dns_dhcp NO
-- 
cgit v1.2.3