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/mrd6/Makefile            | 20 +++++++++++++-------
 package/mrd6/files/mrd6.init     |  4 +++-
 package/mrd6/files/mrd6.postinst |  3 +++
 package/mrd6/ipkg/mrd6.control   |  6 ------
 package/mrd6/ipkg/mrd6.postinst  |  3 ---
 5 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 package/mrd6/files/mrd6.postinst
 delete mode 100644 package/mrd6/ipkg/mrd6.control
 delete mode 100644 package/mrd6/ipkg/mrd6.postinst

(limited to 'package/mrd6')

diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 185157491..4cac9e588 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -9,29 +9,35 @@ PKG_NAME:=		mrd6
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
-MASTER_SITES:=		http://www.openadk.org/distfiles/
+PKG_DESCR:=		IPv6 multicast routing daemon
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-ipv6
+PKG_SITES:=		http://www.openadk.org/distfiles/
+
 WRKBUILD=		${WRKSRC}/src
 
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-nodefaultlibs -luClibc++ -shared
 PKG_DEPENDS:=		uclibc++
 else
 PKG_DEPENDS:=		libstdcxx
 endif
 
-$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TLDFLAGS+=		-nodefaultlibs -luClibc++ -shared
+endif
 
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		EXTRA_FLAGS="${TCFLAGS}" 
 
 post-install:
-	${INSTALL_DIR} ${WRKINST}/etc/init.d
-	${INSTALL_DATA} files/${PKG_NAME}.conf ${WRKINST}/etc
-	${INSTALL_BIN} files/${PKG_NAME}.init ${WRKINST}/etc/init.d/${PKG_NAME}
+	${INSTALL_DIR} ${WRKINST}/etc
+	${INSTALL_DATA} ./files/${PKG_NAME}.conf ${WRKINST}/etc
 	${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin
 	${CP} ${WRKINST}/* ${IDIR_MRD6}/
 
diff --git a/package/mrd6/files/mrd6.init b/package/mrd6/files/mrd6.init
index ed3d4bab6..710cde814 100644
--- a/package/mrd6/files/mrd6.init
+++ b/package/mrd6/files/mrd6.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG mrd6
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/mrd6/files/mrd6.postinst b/package/mrd6/files/mrd6.postinst
new file mode 100644
index 000000000..10332bae6
--- /dev/null
+++ b/package/mrd6/files/mrd6.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf mrd6 mrd6 NO
diff --git a/package/mrd6/ipkg/mrd6.control b/package/mrd6/ipkg/mrd6.control
deleted file mode 100644
index 89082b9f4..000000000
--- a/package/mrd6/ipkg/mrd6.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: mrd6
-Architecture: mipsel
-Section: net
-Priority: optional
-Depends: kmod-ipv6
-Description: IPv6 multicast routing daemon
diff --git a/package/mrd6/ipkg/mrd6.postinst b/package/mrd6/ipkg/mrd6.postinst
deleted file mode 100644
index 10332bae6..000000000
--- a/package/mrd6/ipkg/mrd6.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf mrd6 mrd6 NO
-- 
cgit v1.2.3