From 0001d67471ae603cc44ff67aa0ec466bcfc08754 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 14 May 2005 20:35:05 +0000 Subject: Convert chillispot to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@895 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/chillispot/Makefile | 3 ++- openwrt/package/chillispot/files/chillispot.init | 20 ++++++++++++++++++++ openwrt/package/chillispot/ipkg/chillispot.init | 20 -------------------- 3 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 openwrt/package/chillispot/files/chillispot.init delete mode 100644 openwrt/package/chillispot/ipkg/chillispot.init diff --git a/openwrt/package/chillispot/Makefile b/openwrt/package/chillispot/Makefile index e2be170e8..cacaee255 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 000000000..289b1fe8a --- /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 289b1fe8a..000000000 --- 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 $? -- cgit v1.2.3