simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / hostap / Makefile

diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index f6d0c8d..fe76117 100644 (file)
--- 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),)
@@ -45,8 +41,9 @@ endef
 
 define KernelPackage/hostap
   $(call KernelPackage/hostap/Default)
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211
+  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 \\\
@@ -54,16 +51,19 @@ define KernelPackage/hostap
        PLX/PCI/CS version of the driver to actually use the driver.
 endef
 define KernelPackage/hostap/2.4
+  DEPENDS:=+kmod-crypto
   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
   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
 
 
@@ -71,9 +71,11 @@ 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.
+  AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
 endef
 define KernelPackage/hostap-pci/2.4
   FILES:= \
@@ -82,18 +84,20 @@ 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+=\\\
        \\\
        This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 \\\
        based PCI adaptors.
+  AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
 endef
 define KernelPackage/hostap-plx/2.4
   FILES:= \
@@ -102,7 +106,7 @@ 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
 
 
@@ -114,19 +118,6 @@ ifeq ($(KERNEL),2.4)
                SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
                modules
   endef
-
-  define Package/kmod-hostap-pci/install
-       install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) \
-               $(1)/lib/modules/$(LINUX_VERSION)/
-  endef
-
-  define Package/kmod-hostap-plx/install
-       install -m0755 -d $(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)