X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/17126ba85f34746c5250ce9b2b18611f40a98d2c..0b509e2ff238b0d1f3835becd75376a4b6190d8c:/package/hostap/Makefile

diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 38cdf072d..0b526b620 100644
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -16,10 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
@@ -47,6 +43,7 @@ define KernelPackage/hostap
   $(call KernelPackage/hostap/Default)
   DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211 +kmod-crypto
   TITLE:=Host AP support for Prism2/2.5/3
+  KCONFIG:=CONFIG_HOSTAP
   DESCRIPTION+=\\\
 	\\\
 	This package contains the base Host AP driver code that is shared by \\\
@@ -63,9 +60,8 @@ define KernelPackage/hostap/2.4
   AUTOLOAD:=$(call AutoLoad,60,hostap hostap_crypt_wep hostap_crypt_tkip hostap_crypt_ccmp)
 endef
 define KernelPackage/hostap/2.6
-  KCONFIG:=$(CONFIG_HOSTAP)
   FILES:= \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,hostap)
 endef
 
@@ -74,6 +70,7 @@ define KernelPackage/hostap-pci
   $(call KernelPackage/hostap/Default)
   DEPENDS:=kmod-hostap
   TITLE:=Host AP driver for PCI adaptors
+  KCONFIG:=CONFIG_HOSTAP_PCI
   DESCRIPTION+=\\\
 	\\\
 	This package contains the Host AP driver for Prism2.5 PCI adaptors.
@@ -84,15 +81,15 @@ define KernelPackage/hostap-pci/2.4
 	$(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX)
 endef
 define KernelPackage/hostap-pci/2.6
-  KCONFIG:=$(CONFIG_HOSTAP_PCI)
   FILES:= \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
 endef
 
 
 define KernelPackage/hostap-plx
   $(call KernelPackage/hostap/Default)
   DEPENDS:=kmod-hostap
+  KCONFIG:=CONFIG_HOSTAP_PLX
   TITLE:=Host AP driver for PLX9052 based PCI adaptors
   DESCRIPTION+=\\\
 	\\\
@@ -105,9 +102,8 @@ define KernelPackage/hostap-plx/2.4
 	$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX)
 endef
 define KernelPackage/hostap-plx/2.6
-  KCONFIG:=$(CONFIG_HOSTAP_PLX)
   FILES:= \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
 endef
 
 
@@ -119,19 +115,6 @@ ifeq ($(KERNEL),2.4)
 		SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
 		modules
   endef
-
-  define KernelPackage/hostap-pci/install
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(CP) \
-		$(1)/lib/modules/$(LINUX_VERSION)/
-  endef
-
-  define KernelPackage/hostap-plx/install
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(CP) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
-		$(1)/lib/modules/$(LINUX_VERSION)/
-  endef
 else
   define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)