From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 14 May 2005 20:35:05 +0000 (+0000)
Subject: Convert chillispot to new packaging style
X-Git-Tag: reboot~32827
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b6f0493fefe66909056a99634e1ecd514fea2f58;p=openwrt%2Fopenwrt.git

Convert chillispot to new packaging style

SVN-Revision: 895
---

diff --git a/openwrt/package/chillispot/Makefile b/openwrt/package/chillispot/Makefile
index e2be170e85..cacaee2553 100644
--- a/openwrt/package/chillispot/Makefile
+++ b/openwrt/package/chillispot/Makefile
@@ -15,6 +15,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
+
 $(eval $(call PKG_template,CHILLISPOT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
@@ -60,7 +61,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 
 $(IPKG_CHILLISPOT):
 	install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d
-	install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_CHILLISPOT)/etc/init.d/chilli
+	install -m0755 ./files/$(PKG_NAME).init $(IDIR_CHILLISPOT)/etc/init.d/chilli
 	install -m0755 -d $(IDIR_CHILLISPOT)/etc
 	install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(IDIR_CHILLISPOT)/etc/
 	install -m0755 -d $(IDIR_CHILLISPOT)/usr/sbin
diff --git a/openwrt/package/chillispot/files/chillispot.init b/openwrt/package/chillispot/files/chillispot.init
new file mode 100644
index 0000000000..289b1fe8a5
--- /dev/null
+++ b/openwrt/package/chillispot/files/chillispot.init
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+RUN_D=/var/run
+PID_F=$RUN_D/chilli.pid
+
+case $1 in
+ start)
+  /sbin/insmod tun >/dev/null 2>&1
+  [ -d $RUN_D ] || mkdir -p $RUN_D
+  /usr/sbin/chilli
+  ;;
+ stop)
+  [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
+  ;;
+ *)
+  echo "usage: $0 (start|stop)"
+  exit 1
+esac
+
+exit $?
diff --git a/openwrt/package/chillispot/ipkg/chillispot.init b/openwrt/package/chillispot/ipkg/chillispot.init
deleted file mode 100644
index 289b1fe8a5..0000000000
--- a/openwrt/package/chillispot/ipkg/chillispot.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-RUN_D=/var/run
-PID_F=$RUN_D/chilli.pid
-
-case $1 in
- start)
-  /sbin/insmod tun >/dev/null 2>&1
-  [ -d $RUN_D ] || mkdir -p $RUN_D
-  /usr/sbin/chilli
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
-
-exit $?