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

(limited to 'package/osiris')

diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 62a372ad3..e7d8504e9 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		osiris
 PKG_VERSION:=		4.2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1951c7dc0fe729af9ffaf58910340d12
-MASTER_SITES:=		http://osiris.shmoo.com/data/
+PKG_DESCR:=		Host Integrity Monitoring System (scanning agent)
+PKG_SECTION:=		admin
+PKG_DEPENDS:=		libopenssl libpthread
+PKG_URL:=		http://osiris.shmoo.com
+PKG_SITES:=		http://osiris.shmoo.com/data/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OSIRISD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_openssldir="${STAGING_DIR}/usr" \
@@ -32,10 +36,7 @@ post-configure:
 	(cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh);
 
 post-install:
-	${INSTALL_DIR} ${IDIR_OSIRISD}/etc/init.d
 	${INSTALL_DIR} ${IDIR_OSIRISD}/usr/sbin
-	${INSTALL_BIN} ./files/osirisd.init \
-		${IDIR_OSIRISD}/etc/init.d/osirisd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/osirisd \
 		${IDIR_OSIRISD}/usr/sbin/
 
diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init
index 4172f702a..6d6b4d443 100644
--- a/package/osiris/files/osirisd.init
+++ b/package/osiris/files/osirisd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 75
+#PKG osirisd
+#INIT 75
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/osiris/files/osirisd.postinst b/package/osiris/files/osirisd.postinst
new file mode 100644
index 000000000..04e53ac93
--- /dev/null
+++ b/package/osiris/files/osirisd.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf osirisd osirisd NO
diff --git a/package/osiris/ipkg/osirisd.control b/package/osiris/ipkg/osirisd.control
deleted file mode 100644
index defe7c356..000000000
--- a/package/osiris/ipkg/osirisd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: osirisd
-Priority: optional
-Section: admin
-Depends: libopenssl, libpthread
-Description: an Host Integrity Monitoring System (scanning agent)
diff --git a/package/osiris/ipkg/osirisd.postinst b/package/osiris/ipkg/osirisd.postinst
deleted file mode 100644
index 04e53ac93..000000000
--- a/package/osiris/ipkg/osirisd.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf osirisd osirisd NO
-- 
cgit v1.2.3