qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-29 10:18:28 +02:00
Code

Update chillispot to 1.0RC3, uniformize package Makefile, move ipkg related files to ./ipkg, add conffiles

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@679 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2005-04-18 21:42:27 +00:00
parent ed487fe963
commit 2b5618fd9d
4 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
openwrt/package/chillispot/Makefile
View File

@ -3,28 +3,37 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=chillispot PKG_NAME:=chillispot
PKG_VERSION:=1.0RC2 PKG_VERSION:=1.0RC3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=1b924c0bd592253b1d13af4885ea041a PKG_MD5SUM:=9ad5f4181ae2e9e2d5ccb165c37dfdde
PKG_SOURCE_URL:=http://www.chillispot.org/download/ PKG_SOURCE_URL:= \
http://www.chillispot.org/download/ \
http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_CAT:=zcat PKG_CAT:=zcat
PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
IPKG_CHILLISPOT:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
IDIR_CHILLISPOT:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
INFO_CHILLISPOT:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
$(DL_DIR)/$(PKG_SOURCE): $(DL_DIR)/$(PKG_SOURCE):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
rm -rf $(PKG_BUILD_DIR)
$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(PKG_BUILD_DIR)/.unpacked touch $(PKG_BUILD_DIR)/.prepared
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_memcmp_working=yes \ ac_cv_func_memcmp_working=yes \
ac_cv_func_setvbuf_reversed=no \ ac_cv_func_setvbuf_reversed=no \
@ -51,29 +60,37 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
); );
touch $(PKG_BUILD_DIR)/.configured touch $(PKG_BUILD_DIR)/.configured
$(PKG_BUILD_DIR)/src/chilli: $(PKG_BUILD_DIR)/.configured $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS)
touch $(PKG_BUILD_DIR)/.built
$(PKG_IPK): $(PKG_BUILD_DIR)/src/chilli $(PKG_INSTALL_DIR)/usr/sbin/chilli: $(PKG_BUILD_DIR)/.built
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_INSTALL_DIR)
mkdir -p $(PKG_IPK_DIR)/usr/sbin $(MAKE) -C $(PKG_BUILD_DIR) \
cp $(PKG_BUILD_DIR)/src/chilli $(PKG_IPK_DIR)/usr/sbin/ DESTDIR="$(PKG_INSTALL_DIR)" \
$(STRIP) $(PKG_IPK_DIR)/usr/sbin/* install
mkdir -p $(PKG_IPK_DIR)/etc
cp $(PKG_BUILD_DIR)/doc/chilli.conf $(PKG_IPK_DIR)/etc
cp -a ./ipkg/* $(PKG_IPK_DIR)/
find $(PKG_IPK_DIR) -name CVS | xargs rm -rf
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) $(IPKG_CHILLISPOT): $(PKG_INSTALL_DIR)/usr/sbin/chilli
$(IPKG) install $(PKG_IPK) $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_CHILLISPOT) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
install -m0644 ./ipkg/$(PKG_NAME).conffiles $(IDIR_CHILLISPOT)/CONTROL/conffiles
install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d
install -m0755 ./ipkg/$(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
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/
$(RSTRIP) $(IDIR_CHILLISPOT)
$(IPKG_BUILD) $(IDIR_CHILLISPOT) $(PACKAGE_DIR)
$(INFO_CHILLISPOT): $(IPKG_CHILLISPOT)
$(IPKG) install $(IPKG_CHILLISPOT)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.unpacked prepare: $(PKG_BUILD_DIR)/.prepared
compile: $(PKG_IPK) compile: $(IPKG_CHILLISPOT)
install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list install: $(INFO_CHILLISPOT)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(PKG_IPK) rm -rf $(IPKG_CHILLISPOT)

1
openwrt/package/chillispot/ipkg/chillispot.conffiles Normal file
View File

@ -0,0 +1 @@
/etc/chilli.conf

0
openwrt/package/chillispot/chillispot.control → openwrt/package/chillispot/ipkg/chillispot.control
View File

8
openwrt/package/chillispot/ipkg/etc/init.d/S60chilli → openwrt/package/chillispot/ipkg/chillispot.init Executable file → Normal file
View File

@ -1,12 +1,16 @@
#!/bin/sh #!/bin/sh
RUN_D=/var/run
PID_F=$RUN_D/chilli.pid
case $1 in case $1 in
start) start)
/sbin/insmod tun >/dev/null 2>&1 /sbin/insmod tun >/dev/null 2>&1
[ -d /var/run ] || mkdir -p /var/run [ -d $RUN_D ] || mkdir -p $RUN_D
/usr/sbin/chilli /usr/sbin/chilli
;; ;;
stop) stop)
[ -f /var/run/chilli.pid ] && kill $(cat /var/run/chilli.pid) >/dev/null 2>&1 [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
;; ;;
*) *)
echo "usage: $0 (start|stop)" echo "usage: $0 (start|stop)"