[packages] coova-chilli: update to 1.2.2 (#6721)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@19817 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2010-02-22 20:11:16 +00:00
parent e38d2cf083
commit 95c0350540
2 changed files with 8 additions and 13 deletions

View File

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=coova-chilli PKG_NAME:=coova-chilli
PKG_VERSION:=1.2.1 PKG_VERSION:=1.2.2
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ap.coova.org/chilli/ PKG_SOURCE_URL:=http://ap.coova.org/chilli
PKG_MD5SUM:=f4c0cdb903b6a830cd7c8a54db2334e8 PKG_MD5SUM:=44042e26c3b3c6e64a9a8769328b437d
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -23,7 +24,7 @@ define Package/coova-chilli
SUBMENU:=Captive Portals SUBMENU:=Captive Portals
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-tun DEPENDS:=+kmod-tun +librt
TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version) TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
URL:=http://www.coova.org/CoovaChilli URL:=http://www.coova.org/CoovaChilli
endef endef
@ -42,19 +43,13 @@ define Package/coova-chilli/conffiles
/etc/chilli.conf /etc/chilli.conf
endef endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/coova-chilli/install define Package/coova-chilli/install
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/chilli $(INSTALL_DIR) $(1)/etc/chilli
$(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/ $(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
endef endef

View File

@ -1,6 +1,6 @@
--- a/conf/functions.in --- a/conf/functions.in
+++ b/conf/functions.in +++ b/conf/functions.in
@@ -164,6 +164,7 @@ @@ -173,6 +173,7 @@ writeconfig() {
if [ "$HS_RADCONF" != "on" -a "$HS_RADCONF" != "url" ]; then if [ "$HS_RADCONF" != "on" -a "$HS_RADCONF" != "url" ]; then
[ "$HS_PAP_OK" = "on" ] && addconfig2 "papalwaysok" [ "$HS_PAP_OK" = "on" ] && addconfig2 "papalwaysok"
[ "$HS_MACAUTH" = "on" ] && addconfig2 "macauth" [ "$HS_MACAUTH" = "on" ] && addconfig2 "macauth"