X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6715482e0228bc376e2bb296dceb10e3f7d6c491..a33e79fbcb9b157574de4baaea87b5870e29d798:/package/hostap-driver/Makefile?ds=sidebyside

diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile
index 176aaa8c9..d08fd9c0a 100644
--- a/package/hostap-driver/Makefile
+++ b/package/hostap-driver/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,27 +10,16 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=hostap-driver
 PKG_VERSION:=0.4.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 
 include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  -include $(LINUX_DIR)/.config
-endif
-
-define KernelPackage/hostap/Default/2.4
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-endef
-
-define KernelPackage/hostap/Default/2.6
-  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
-endef
 
 define KernelPackage/hostap/Default
-$(call KernelPackage/hostap/Default/$(KERNEL))
+  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
   SUBMENU:=Wireless Drivers
   URL:=http://hostap.epitest.fi/
 endef
@@ -45,27 +34,9 @@ endef
 define KernelPackage/hostap
 $(call KernelPackage/hostap/Default)
   TITLE:=Host AP support for Prism2/2.5/3
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211 +wireless-tools
-  KCONFIG:=CONFIG_HOSTAP
-  PROVIDES:=kmod-hostap
-endef
-
-define KernelPackage/hostap/2.4
-# NOTE: needed to remove the dependency on kmod-ieee80211 in the final ipkg
-  DEPENDS:=
-# NOTE: needed to build the standalone version on 2.4
-  KCONFIG:=
-  FILES:= \
-	$(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,hostap hostap_crypt_wep hostap_crypt_tkip hostap_crypt_ccmp)
-endef
-
-define KernelPackage/hostap/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools
+  KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.ko
   AUTOLOAD:=$(call AutoLoad,60,hostap)
 endef
 
@@ -80,20 +51,11 @@ endef
 define KernelPackage/hostap-cs
 $(call KernelPackage/hostap/Default)
   TITLE:=Host AP driver for PCMCIA adaptors
-  DEPENDS:=@PCMCIA_SUPPORT kmod-hostap +kmod-pcmcia-core
+  DEPENDS:=@PCMCIA_SUPPORT +kmod-hostap +kmod-pcmcia-core
   KCONFIG:=CONFIG_HOSTAP_CS
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.ko
   AUTOLOAD:=$(call AutoLoad,60,hostap_cs)
 endef
-define KernelPackage/hostap-cs/2.4
-# NOTE: needed to build the standalone version on 2.4
-  KCONFIG:=
-  FILES:= \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_cs.$(LINUX_KMOD_SUFFIX)
-endef
-define KernelPackage/hostap-cs/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.$(LINUX_KMOD_SUFFIX)
-endef
 
 define KernelPackage/hostap-cs/description
 $(call KernelPackage/hostap/Default/description)
@@ -104,23 +66,12 @@ endef
 define KernelPackage/hostap-pci
 $(call KernelPackage/hostap/Default)
   TITLE:=Host AP driver for PCI adaptors
-  DEPENDS:=@PCI_SUPPORT kmod-hostap
+  DEPENDS:=@PCI_SUPPORT +kmod-hostap
   KCONFIG:=CONFIG_HOSTAP_PCI
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.ko
   AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
 endef
 
-define KernelPackage/hostap-pci/2.4
-# NOTE: needed to build the standalone version on 2.4
-  KCONFIG:=
-  FILES:= \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/hostap-pci/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
-endef
-
 define KernelPackage/hostap-pci/description
 $(call KernelPackage/hostap/Default/description)
  This package contains the Host AP driver for Prism2.5 PCI adaptors.
@@ -130,23 +81,12 @@ endef
 define KernelPackage/hostap-plx
 $(call KernelPackage/hostap/Default)
   TITLE:=Host AP driver for PLX9052 based PCI adaptors
-  DEPENDS:=@PCI_SUPPORT kmod-hostap
+  DEPENDS:=@PCI_SUPPORT +kmod-hostap
   KCONFIG:=CONFIG_HOSTAP_PLX
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.ko
   AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
 endef
 
-define KernelPackage/hostap-plx/2.4
-# NOTE: needed to build the standalone version on 2.4
-  KCONFIG:=
-  FILES:= \
-	$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/hostap-plx/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
-endef
-
 define KernelPackage/hostap-plx/description
 $(call KernelPackage/hostap/Default/description)
  This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 
@@ -154,32 +94,19 @@ $(call KernelPackage/hostap/Default/description)
 endef
 
 
-ifeq ($(KERNEL),2.4)
-  define Build/Compile
-	$(MAKE) -C $(LINUX_DIR)/ \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
-		modules
-  endef
-else
-  define Build/Prepare
+define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
-  endef
-  
-  define Build/Configure
-  endef
-  
-  define Build/Compile
-  endef
-endif
-
-define KernelPackage/hostap-pci/install
-	$(INSTALL_DIR) $(1)/lib/wifi
-	$(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
 endef
 
-define KernelPackage/hostap-plx/install
+define Build/Configure
+
+endef
+
+define Build/Compile
+
+endef
+
+define KernelPackage/hostap/install
 	$(INSTALL_DIR) $(1)/lib/wifi
 	$(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
 endef