refresh all package patches in the buildroot using quilt

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 962795a..584b967 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,19 +10,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi

-PKG_VERSION:=0.9.2
+PKG_VERSION:=r2420-20070602
+PKG_BRANCH:=madwifi-ng

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=a75baacbe07085ddc5cb28e1fb43edbb
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
+PKG_MD5SUM:=1ba88326b8dc8c231562329fc2e39578

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-RATE_CONTROL:=sample
+RATE_CONTROL:=minstrel

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


@@ -36,13 +35,17 @@ endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif

+ifeq ($(ARCH),arm)
+  HAL_TARGET:=xscale-le-elf
+endif

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

-ifneq ($(CONFIG_LINUX_2_4_AR531X),)
+ifneq ($(CONFIG_LINUX_2_6_ATHEROS),)

   BUS:=AHB
   BUS:=AHB

+  HAL_TARGET:=ap51

 endif
 ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
   BUS:=PCI AHB # no suitable HAL for AHB yet.
 endif
 ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
   BUS:=PCI AHB # no suitable HAL for AHB yet.


@@ -77,14 +80,14 @@ endif
 
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
 
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers

-  DEFAULT:=y if LINUX_2_6_BRCM || LINUX_2_6_ARUBA || LINUX_2_4_AR531X || LINUX_2_6_XSCALE, m if ALL

   TITLE:=Driver for Atheros wireless chipsets
   TITLE:=Driver for Atheros wireless chipsets

+  DEPENDS:=+wireless-tools

   DESCRIPTION:=\
        This package contains a driver for Atheros 802.11a/b/g chipsets.
   URL:=http://madwifi.org/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
   DESCRIPTION:=\
        This package contains a driver for Atheros 802.11a/b/g chipsets.
   URL:=http://madwifi.org/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \

-               $(PKG_BUILD_DIR)/ath/ath_hal.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \

                $(BUS_MODULES) \
                $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX)
                $(BUS_MODULES) \
                $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX)


@@ -99,25 +102,33 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                TOOLPATH="$(KERNEL_CROSS)" \
                KERNELPATH="$(LINUX_DIR)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                TOOLPATH="$(KERNEL_CROSS)" \
                KERNELPATH="$(LINUX_DIR)" \

-               LDOPTS=" " \
+               LDOPTS="--no-warn-mismatch " \

                ATH_RATE="ath_rate/$(RATE_CONTROL)" \
                ATH_RATE="ath_rate/$(RATE_CONTROL)" \

+               WARNINGS="" \

                DOMULTI=1
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
   define Build/Compile/ahb
                DOMULTI=1
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
   define Build/Compile/ahb

-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules

   endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
   define Build/Compile/pci
   endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
   define Build/Compile/pci

-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules

   endef
 endif
 
   endef
 endif
 

+define Build/Configure
+       $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
+endef
+

 define Build/Compile
        $(call Build/Compile/ahb)
        $(call Build/Compile/pci)
 define Build/Compile
        $(call Build/Compile/ahb)
        $(call Build/Compile/pci)

+       $(MAKE) $(MADWIFI_MAKEOPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               tools

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -132,11 +143,10 @@ define Build/UninstallDev
 endef
 
 define KernelPackage/madwifi/install
 endef
 
 define KernelPackage/madwifi/install

-       mkdir -p $(1)/etc/init.d
-       mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
-       mkdir -p $(1)/usr/sbin
-       install -m0755 ./files/madwifi.init $(1)/etc/init.d/madwifi
-       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
+       $(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
 
 $(eval $(call KernelPackage,madwifi))
 endef
 
 $(eval $(call KernelPackage,madwifi))