stop build when an error occurs and when BUILDLOG is set (#5160)

[openwrt.git] / package / hostap-driver / Makefile

diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile
index 176aaa8..85a4228 100644 (file)
--- a/package/hostap-driver/Makefile
+++ b/package/hostap-driver/Makefile
@@ -45,8 +45,8 @@ endef
 define KernelPackage/hostap
 $(call KernelPackage/hostap/Default)
   TITLE:=Host AP support for Prism2/2.5/3
 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
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +!LINUX_2_6_29&&!LINUX_2_6_30:kmod-ieee80211 +LINUX_2_6_29||LINUX_2_6_30:kmod-lib80211 +wireless-tools
+  KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y

   PROVIDES:=kmod-hostap
 endef
 
   PROVIDES:=kmod-hostap
 endef
 


@@ -174,12 +174,7 @@ else
   endef
 endif
 
   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 KernelPackage/hostap/install

        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
 endef
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
 endef