move the common variables from host-build.mk to host.mk

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 380ec4a..a418006 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,16 +10,31 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=0.9.0
+PKG_VERSION:=0.9.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=9b558d1df84cab2b0006c595feee0fba
 
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 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)
 
+include $(INCLUDE_DIR)/package.mk
+
+define Package/kmod-madwifi
+  SECTION:=kernel
+  CATEGORY:=Kernel 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
+  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)
+endef
+
+RATE_CONTROL:=sample
+
 ifeq ($(ARCH),mips)
   HAL_TARGET:=mips-be-elf
 endif
@@ -32,13 +47,16 @@ endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif
+ifeq ($(ARCH),powerpc)
+  HAL_TARGET:=powerpc-be-elf
+endif
 
-BUS := PCI
+BUS:=PCI
 ifneq ($(CONFIG_LINUX_2_4_AR531X),)
-  BUS := AHB
+  BUS:=AHB
 endif
 ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
-  BUS := PCI AHB       # no suitable HAL for AHB yet.
+  BUS:=PCI AHB # no suitable HAL for AHB yet.
 endif
 
 BUS_MODULES:=
@@ -50,33 +68,32 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
 endif
 
 MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
+               PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               CC="$(TARGET_CC)" \
                TARGET="$(HAL_TARGET)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                TOOLPATH="$(KERNEL_CROSS)" \
                KERNELPATH="$(LINUX_DIR)" \
-               LDOPTS="" \
+               LDOPTS=" " \
+               ATH_RATE="ath_rate/$(RATE_CONTROL)" \
                DOMULTI=1
 
-include $(INCLUDE_DIR)/package.mk
-
 ifeq ($(findstring AHB,$(BUS)),AHB)
-define Build/Compile/ahb
+  define Build/Compile/ahb
        $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
-endef
+  endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
-define Build/Compile/pci
+  define Build/Compile/pci
        $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
-endef
+  endef
 endif
 
 define Build/Compile
-$(call Build/Compile/ahb)
-$(call Build/Compile/pci)
+       $(call Build/Compile/ahb)
+       $(call Build/Compile/pci)
 endef
 
 define Build/InstallDev
@@ -87,17 +104,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-       rm -rf $(STAGING_DIR)/usr/include/madwifi
-endef
-
-define Package/kmod-madwifi
- SECTION:=drivers
- CATEGORY:=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
- DESCRIPTION:=Driver for Atheros 802.11a/b/g chipsets
- URL:=http://madwifi.org/
- VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+       rm -rf  $(STAGING_DIR)/usr/include/madwifi
 endef
 
 define Package/kmod-madwifi/install
@@ -106,6 +113,7 @@ define Package/kmod-madwifi/install
        mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
        mkdir -p $(1)/usr/sbin
        install -m0644 ./files/madwifi.modules $(1)/etc/modules.d/20-madwifi
+       echo ath_rate_$(RATE_CONTROL) >> $(1)/etc/modules.d/20-madwifi
 ifeq ($(findstring AHB,$(BUS)),AHB)
        echo ath_ahb >> $(1)/etc/modules.d/20-madwifi
 endif
@@ -114,10 +122,10 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
 endif
        install -m0755 ./files/madwifi.init $(1)/etc/init.d/S20madwifi
        $(CP) \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath/ath_hal.$(LINUX_KMOD_SUFFIX) \
                $(BUS_MODULES) \
-               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
-               $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/
        $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
 endef