[kernel] nefilter: fix chaostables on 2.6.24

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index f4f7fcd..1cf9246 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,18 +10,23 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=r2568-20070710
-PKG_BRANCH:=madwifi-ng
-PKG_RELEASE:=2
+PKG_REV:=3280
+PKG_VERSION:=r$(PKG_REV)
+# PKG_BRANCH:=madwifi-dfs
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
-PKG_MD5SUM:=fe5d41acd085d2c46934be3f8839e694
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
+# MADWIFI_DEBUG=1
+
 ifeq ($(ARCH),mips)
   HAL_TARGET:=mips-be-elf
 endif
@@ -31,6 +36,9 @@ endif
 ifeq ($(ARCH),i386)
   HAL_TARGET:=i386-elf
 endif
+ifeq ($(ARCH),i686)
+  HAL_TARGET:=i386-elf
+endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif
@@ -82,14 +90,20 @@ MADWIFI_AUTOLOAD:= \
        wlan_xauth \
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
-       MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
-       MADWIFI_AUTOLOAD+= ath_ahb
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_AUTOLOAD+= ath_ahb
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)
-       MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
-       MADWIFI_AUTOLOAD+= ath_pci
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_AUTOLOAD+= ath_pci
+endif
+
+MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig
+ifneq ($(MADWIFI_DEBUG),)
+  MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug
 endif
 
+
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
@@ -103,17 +117,6 @@ define KernelPackage/madwifi/description
  This package contains a driver for Atheros 802.11a/b/g chipsets.
 endef
 
-define KernelPackage/madwifi-karma
-  $(call KernelPackage/madwifi)
-  TITLE:=Madwifi for Karma support
-  URL:=http://www.digininja.org/
-endef
-
-define KernelPackage/madwifi-karma/description
-  This package contains a modified driver to be used with 
-  the Karma software for Atheros 802.11a/b/g chipsets.
-endef
-
 MAKE_ARGS:= \
        PATH="$(TARGET_PATH)" \
        ARCH="$(LINUX_KARCH)" \
@@ -124,7 +127,8 @@ MAKE_ARGS:= \
        KERNELPATH="$(LINUX_DIR)" \
        LDOPTS="--no-warn-mismatch " \
        ATH_RATE="ath_rate/$(RATE_CONTROL)" \
-       WARNINGS="" \
+       WARNINGS="-Wno-unused" \
+       $(if $(MADWIFI_DEBUG),,DEBUG="") \
        DOMULTI=1
 
 MAKE_VARS:= \
@@ -146,9 +150,6 @@ endif
 
 define Build/Configure
        $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
-ifneq ($(CONFIG_PACKAGE_kmod-madwifi-karma),)
-       $(PATCH) $(PKG_BUILD_DIR) ./files
-endif
 endef
 
 define Build/Compile
@@ -163,23 +164,11 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/
 endef
 
-define Build/UninstallDev
-       rm -rf $(1)/usr/include/madwifi
-endef
-
 define KernelPackage/madwifi/install
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
-endef
-
-define KernelPackage/madwifi-karma/install
-       $(INSTALL_DIR) $(1)/lib/wifi
-       $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,$(MADWIFI_APPLETS)} $(1)/usr/sbin/
 endef
 
 $(eval $(call KernelPackage,madwifi))
-$(eval $(call KernelPackage,madwifi-karma))