update madwifi, see #385, 105-radiotap_endian_fix.patch is integrated upstream

[openwrt.git] / target / linux / package / madwifi / Makefile

diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index 5432055..66f6258 100644 (file)
--- a/target/linux/package/madwifi/Makefile
+++ b/target/linux/package/madwifi/Makefile
@@ -3,20 +3,16 @@
 include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 include $(TOPDIR)/rules.mk
 include ../../rules.mk
 

-PKG_NAME:=madwifi
-PKG_VERSION:=r1358-20051215
+PKG_NAME:=madwifi-ng
+PKG_VERSION:=r1475-20060317

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=0ef00a095359e5af313f52446ebfbbf1
+PKG_MD5SUM:=b25d4b4d790e890564109348b1ff9005

 
 

-PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng
-PKG_SOURCE:=$(PKG_NAME)-ng-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_NAME)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

 PKG_CAT:=zcat
 
 PKG_CAT:=zcat
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-ng-$(PKG_VERSION)
-
-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

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


@@ -28,53 +24,73 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
 HAL_TARGET:=i386-elf
 endif
 

+BUS := PCI
+

 ifneq ($(BR2_LINUX_2_4_AR531X),)
        BUS := AHB
 ifneq ($(BR2_LINUX_2_4_AR531X),)
        BUS := AHB

-       bus := ahb
-else
-       BUS := PCI
-       bus := pci
+endif
+ifneq ($(BR2_LINUX_2_6_ARUBA),)
+       BUS := PCI AHB  # no suitable HAL for AHB yet.
+endif
+
+BUS_MODULES:=
+ifeq ($(findstring AHB,$(BUS)),AHB)
+BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+endif
+ifeq ($(findstring PCI,$(BUS)),PCI)
+BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)

 endif
 
 endif
 

+

 include $(TOPDIR)/package/rules.mk
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
+$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))

 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 

-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \

                PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                TARGET="$(HAL_TARGET)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                TOOLPATH="$(KERNEL_CROSS)" \
                PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                TARGET="$(HAL_TARGET)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                TOOLPATH="$(KERNEL_CROSS)" \

-               KERNELPATH="$(KERNEL_DIR)" \
-               BUS="$(BUS)" \
-               all
+               KERNELPATH="$(LINUX_DIR)" \
+               DOMULTI=1
+
+
+$(PKG_BUILD_DIR)/.built:
+ifeq ($(findstring AHB,$(BUS)),AHB)
+       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+endif
+ifeq ($(findstring PCI,$(BUS)),PCI)
+       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+endif
+       $(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi

        touch $@
 
 $(IPKG_KMOD_MADWIFI):
        mkdir -p $(IDIR_KMOD_MADWIFI)/etc/modules.d
        mkdir -p $(IDIR_KMOD_MADWIFI)/etc/init.d
        mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
        touch $@
 
 $(IPKG_KMOD_MADWIFI):
        mkdir -p $(IDIR_KMOD_MADWIFI)/etc/modules.d
        mkdir -p $(IDIR_KMOD_MADWIFI)/etc/init.d
        mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)

+       mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin

        install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
        install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi

-       cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
+       $(CP)   $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \

                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \

-               $(PKG_BUILD_DIR)/ath/ath_$(bus).$(LINUX_KMOD_SUFFIX) \
+               $(BUS_MODULES) \

                $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
                $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/

+       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/

        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/madwifi
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/madwifi

-       cp -fpR $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
+       $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/

        mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
        mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211

-       cp -fpR $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
+       $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h