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/vrrpd/Makefile             | 10 ++++------
 package/vrrpd/files/vrrpd.init     |  4 +++-
 package/vrrpd/files/vrrpd.postinst |  4 ++++
 package/vrrpd/ipkg/vrrpd.control   |  4 ----
 package/vrrpd/ipkg/vrrpd.postinst  |  4 ----
 5 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 package/vrrpd/files/vrrpd.postinst
 delete mode 100644 package/vrrpd/ipkg/vrrpd.control
 delete mode 100644 package/vrrpd/ipkg/vrrpd.postinst

(limited to 'package/vrrpd')

diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index 695333b68..863fc1012 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -9,12 +9,13 @@ PKG_NAME:=		vrrpd
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		9
 PKG_MD5SUM:=		6d5066ea1a6ced817376ca0f54765447
-
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=vrrpd/}
+PKG_DESCR:=		An implementation of the Virtual Router Redundancy Protocol
+PKG_SECTION:=		net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vrrpd/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,VRRPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
 MAKE_FLAGS:=		CC="${TARGET_CC}" \
@@ -23,9 +24,6 @@ MAKE_FLAGS:=		CC="${TARGET_CC}" \
 ALL_TARGET:=		vrrpd
 
 do-install:
-	${INSTALL_DIR} ${IDIR_VRRPD}/etc/init.d/
-	${INSTALL_BIN} ./files/vrrpd.init \
-		${IDIR_VRRPD}/etc/init.d/vrrpd
 	${INSTALL_DIR} ${IDIR_VRRPD}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/vrrpd ${IDIR_VRRPD}/usr/sbin/
 
diff --git a/package/vrrpd/files/vrrpd.init b/package/vrrpd/files/vrrpd.init
index 4660428fb..cbac88074 100644
--- a/package/vrrpd/files/vrrpd.init
+++ b/package/vrrpd/files/vrrpd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 70
+#PKG vrrpd
+#INIT 70
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/vrrpd/files/vrrpd.postinst b/package/vrrpd/files/vrrpd.postinst
new file mode 100644
index 000000000..4f40f8b1e
--- /dev/null
+++ b/package/vrrpd/files/vrrpd.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf vrrpd vrrpd NO
+add_rcconf vrrpd_flags vrrpd_flags "-i vlan1 -v 1 192.168.1.1"
diff --git a/package/vrrpd/ipkg/vrrpd.control b/package/vrrpd/ipkg/vrrpd.control
deleted file mode 100644
index 435dda18f..000000000
--- a/package/vrrpd/ipkg/vrrpd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: vrrpd
-Priority: optional
-Section: net
-Description: An implementation of the Virtual Router Redundancy Protocol
diff --git a/package/vrrpd/ipkg/vrrpd.postinst b/package/vrrpd/ipkg/vrrpd.postinst
deleted file mode 100644
index 4f40f8b1e..000000000
--- a/package/vrrpd/ipkg/vrrpd.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf vrrpd vrrpd NO
-add_rcconf vrrpd_flags vrrpd_flags "-i vlan1 -v 1 192.168.1.1"
-- 
cgit v1.2.3