fix vpi/vci setting for pppoa

[openwrt.git] / package / hostapd / Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 867cda6..ba16193 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk


@@ -5,24 +11,32 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=hostapd
 PKG_VERSION:=0.5.3
 PKG_RELEASE:=1
 PKG_NAME:=hostapd
 PKG_VERSION:=0.5.3
 PKG_RELEASE:=1

-PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb
-PKG_BUILDDEP:=madwifi

 
 

-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb

 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

-include $(TOPDIR)/include/package.mk
+PKG_BUILDDEP:=madwifi
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+endef

 
 define Package/hostapd
 
 define Package/hostapd

-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=+libopenssl
-TITLE:=IEEE 802.1x Authenticator
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator
-URL:=http://hostap.epitest.fi/
+  $(call Package/hostapd/Default)
+  DEPENDS:=+libopenssl
+  TITLE+= (full)
+  DESCRIPTION:=\
+       This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
+       Authenticator.

 endef
 
 define Package/hostapd/conffiles
 endef
 
 define Package/hostapd/conffiles


@@ -30,10 +44,11 @@ define Package/hostapd/conffiles
 endef
 
 define Package/hostapd-mini
 endef
 
 define Package/hostapd-mini

-$(call Package/hostapd)
-TITLE:=IEEE 802.1x Authenticator (WPA-PSK only)
-DEPENDS:=
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (WPA-PSK only)
+  $(call Package/hostapd/Default)
+  TITLE+= (WPA-PSK only)
+  DESCRIPTION:=\
+       This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
+       (WPA-PSK only).

 endef
 
 define Package/hostapd-mini/conffiles
 endef
 
 define Package/hostapd-mini/conffiles


@@ -41,10 +56,12 @@ define Package/hostapd-mini/conffiles
 endef
 
 define Package/hostapd-utils
 endef
 
 define Package/hostapd-utils

-$(call Package/hostapd)
-DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
-TITLE:=IEEE 802.1x Authenticator (utils)
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (command line utils)
+  $(call Package/hostapd/Default)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
+  TITLE+= (utils)
+  DESCRIPTION:=\
+       This package contains a command line utility to control the \\\
+       IEEE 802.1x/WPA/EAP/RADIUS Authenticator.

 endef
 
 define Build/ConfigureTarget
 endef
 
 define Build/ConfigureTarget


@@ -81,11 +98,10 @@ define Package/Template
   define Build/Compile/$(2)
        $(call Build/CompileTarget,$(2))
   endef
   define Build/Compile/$(2)
        $(call Build/CompileTarget,$(2))
   endef

- endif
-
- define Package/$(1)/install
+  define Package/$(1)/install

        $(call Package/InstallTemplate,$(1),$(2))
        $(call Package/InstallTemplate,$(1),$(2))

- endef
+  endef
+ endif

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure