[package] base-files: cached state vars after scan_interfaces might be out of sync...

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 16ce30e..bb621dd 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=madwifi
 
 PKG_REV:=3314
 PKG_VERSION:=r$(PKG_REV)
 
 PKG_REV:=3314
 PKG_VERSION:=r$(PKG_REV)

-PKG_RELEASE:=4
+PKG_RELEASE:=5

 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)


@@ -85,6 +85,9 @@ endif
 ifeq ($(BOARD),orion)
   HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi)
 endif
 ifeq ($(BOARD),orion)
   HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi)
 endif

+ifeq ($(BOARD),cns3xxx)
+  HAL_TARGET:=arm11-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi)
+endif

 ifeq ($(ARCH),powerpc)
   HAL_TARGET:=powerpc-be-elf
 endif
 ifeq ($(ARCH),powerpc)
   HAL_TARGET:=powerpc-be-elf
 endif


@@ -112,19 +115,19 @@ ifdef CONFIG_MADWIFI_RCA_SAMPLERATE
 endif
 
 ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)
 endif
 
 ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)

-MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX)
+MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko

 else
 MADWIFI_FILES:= \
 else
 MADWIFI_FILES:= \

-       $(PKG_BUILD_DIR)/net80211/wlan.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_acl.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_ccmp.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_tkip.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_wep.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/net80211/wlan_xauth.$(LINUX_KMOD_SUFFIX)
+       $(PKG_BUILD_DIR)/net80211/wlan.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.ko \
+       $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko \
+       $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_acl.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_ccmp.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_tkip.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_wep.ko \
+       $(PKG_BUILD_DIR)/net80211/wlan_xauth.ko

 endif
 
 ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)
 endif
 
 ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)


@@ -144,11 +147,11 @@ else
 endif
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
 endif
 
 ifeq ($(findstring AHB,$(BUS)),AHB)

-  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.ko

   MADWIFI_AUTOLOAD+= ath_ahb
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)
   MADWIFI_AUTOLOAD+= ath_ahb
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)

-  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.ko

   MADWIFI_AUTOLOAD+= ath_pci
 endif
 
   MADWIFI_AUTOLOAD+= ath_pci
 endif
 


@@ -161,9 +164,11 @@ define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi-project.org/
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi-project.org/

-  DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @!TARGET_sibyte @!TARGET_cobalt @!TARGET_octeon @LINUX_2_6 @(!TARGET_ep93xx||BROKEN)
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+  DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN)

   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))

+  MENU:=1

 endef
 
 define KernelPackage/madwifi/description
 endef
 
 define KernelPackage/madwifi/description