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/watchdog/Makefile                 | 12 +++++-------
 package/watchdog/files/watchdog.conffiles |  1 +
 package/watchdog/files/watchdog.init      |  3 ++-
 package/watchdog/files/watchdog.postinst  |  3 +++
 package/watchdog/ipkg/watchdog.conffiles  |  1 -
 package/watchdog/ipkg/watchdog.control    |  4 ----
 package/watchdog/ipkg/watchdog.postinst   |  3 ---
 7 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 package/watchdog/files/watchdog.conffiles
 create mode 100644 package/watchdog/files/watchdog.postinst
 delete mode 100644 package/watchdog/ipkg/watchdog.conffiles
 delete mode 100644 package/watchdog/ipkg/watchdog.control
 delete mode 100644 package/watchdog/ipkg/watchdog.postinst

(limited to 'package/watchdog')

diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index a29bc79fc..3c2d61a4c 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -9,11 +9,13 @@ PKG_NAME:=		watchdog
 PKG_VERSION:=		5.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		66480128b9dabcced2e4c8db3e60fa50
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=watchdog/}
+PKG_DESCR:=		watchdog daemon
+PKG_SECTION:=		sys
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=watchdog/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
@@ -23,12 +25,8 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_WATCHDOG}/etc/
+	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
 	${INSTALL_DATA} ${WRKINST}/etc/watchdog.conf ${IDIR_WATCHDOG}/etc/
-	${INSTALL_DIR} ${IDIR_WATCHDOG}/etc/init.d/
-	${INSTALL_BIN} ./files/watchdog.init \
-		${IDIR_WATCHDOG}/etc/init.d/watchdog
-	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
 		       ${WRKINST}/usr/sbin/wd_keepalive ${IDIR_WATCHDOG}/usr/sbin/
 
diff --git a/package/watchdog/files/watchdog.conffiles b/package/watchdog/files/watchdog.conffiles
new file mode 100644
index 000000000..3ef13592a
--- /dev/null
+++ b/package/watchdog/files/watchdog.conffiles
@@ -0,0 +1 @@
+/etc/watchdog.conf
diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init
index fba89afe5..c5be0f768 100644
--- a/package/watchdog/files/watchdog.init
+++ b/package/watchdog/files/watchdog.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 15
+#PKG watchdog
+#INIT 15
 
 . /etc/rc.conf 
 
diff --git a/package/watchdog/files/watchdog.postinst b/package/watchdog/files/watchdog.postinst
new file mode 100644
index 000000000..17d144395
--- /dev/null
+++ b/package/watchdog/files/watchdog.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf watchdog watchdog NO
diff --git a/package/watchdog/ipkg/watchdog.conffiles b/package/watchdog/ipkg/watchdog.conffiles
deleted file mode 100644
index 3ef13592a..000000000
--- a/package/watchdog/ipkg/watchdog.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/watchdog.conf
diff --git a/package/watchdog/ipkg/watchdog.control b/package/watchdog/ipkg/watchdog.control
deleted file mode 100644
index 1cde1974e..000000000
--- a/package/watchdog/ipkg/watchdog.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: watchdog
-Priority: opt
-Section: sys
-Description: watchdog
diff --git a/package/watchdog/ipkg/watchdog.postinst b/package/watchdog/ipkg/watchdog.postinst
deleted file mode 100644
index 17d144395..000000000
--- a/package/watchdog/ipkg/watchdog.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf watchdog watchdog NO
-- 
cgit v1.2.3