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/chillispot/Makefile | 11 ++++++-----
package/chillispot/files/chillispot.conffiles | 1 +
package/chillispot/files/chillispot.init | 3 ++-
package/chillispot/files/chillispot.postinst | 3 +++
package/chillispot/ipkg/chillispot.conffiles | 1 -
package/chillispot/ipkg/chillispot.control | 5 -----
package/chillispot/ipkg/chillispot.postinst | 3 ---
7 files changed, 12 insertions(+), 15 deletions(-)
create mode 100644 package/chillispot/files/chillispot.conffiles
create mode 100644 package/chillispot/files/chillispot.postinst
delete mode 100644 package/chillispot/ipkg/chillispot.conffiles
delete mode 100644 package/chillispot/ipkg/chillispot.control
delete mode 100644 package/chillispot/ipkg/chillispot.postinst
(limited to 'package/chillispot')
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 367249294..65db0067a 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -9,23 +9,24 @@ PKG_NAME:= chillispot
PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b
-MASTER_SITES= http://www.chillispot.info/download/
+PKG_DESCR:= Wireless LAN Access Point Controller
+PKG_SECTION:= net
+PKG_DEPENDS:= kmod-tun
+PKG_URL:= http://www.chillispot.info
+PKG_SITES= http://www.chillispot.info/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
INSTALL_STYLE= auto
post-install:
- ${INSTALL_DIR} ${IDIR_CHILLISPOT}/etc/init.d
${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin
${INSTALL_BIN} ./files/chilli.conf \
${IDIR_CHILLISPOT}/etc/
- ${INSTALL_BIN} ./files/${PKG_NAME}.init \
- ${IDIR_CHILLISPOT}/etc/init.d/chilli
${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/chillispot/files/chillispot.conffiles b/package/chillispot/files/chillispot.conffiles
new file mode 100644
index 000000000..08485167d
--- /dev/null
+++ b/package/chillispot/files/chillispot.conffiles
@@ -0,0 +1 @@
+/etc/chilli.conf
diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init
index c2a6cd489..308668fca 100644
--- a/package/chillispot/files/chillispot.init
+++ b/package/chillispot/files/chillispot.init
@@ -1,5 +1,6 @@
#!/bin/sh
-#FWINIT 70
+#PKG chillispot
+#INIT 70
. /etc/rc.conf
case $1 in
diff --git a/package/chillispot/files/chillispot.postinst b/package/chillispot/files/chillispot.postinst
new file mode 100644
index 000000000..20ad12d8c
--- /dev/null
+++ b/package/chillispot/files/chillispot.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf chillispot chillispot NO
diff --git a/package/chillispot/ipkg/chillispot.conffiles b/package/chillispot/ipkg/chillispot.conffiles
deleted file mode 100644
index 08485167d..000000000
--- a/package/chillispot/ipkg/chillispot.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/chilli.conf
diff --git a/package/chillispot/ipkg/chillispot.control b/package/chillispot/ipkg/chillispot.control
deleted file mode 100644
index 0bb2badb8..000000000
--- a/package/chillispot/ipkg/chillispot.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: chillispot
-Priority: optional
-Section: net
-Depends: kmod-tun
-Description: ChilliSpot is a Wireless LAN Access Point Controller.
diff --git a/package/chillispot/ipkg/chillispot.postinst b/package/chillispot/ipkg/chillispot.postinst
deleted file mode 100644
index 20ad12d8c..000000000
--- a/package/chillispot/ipkg/chillispot.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf chillispot chillispot NO
--
cgit v1.2.3