large target/linux cleanup

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

diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index 2f573d6..c6dd8e1 100644 (file)
--- a/target/linux/package/madwifi/Makefile
+++ b/target/linux/package/madwifi/Makefile
@@ -4,19 +4,15 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=r1195-20051021
+PKG_VERSION:=r1358-20051215
 PKG_RELEASE:=1
-PKG_MD5SUM:=5d6a52260ece434a2e3b4ff826a3c5f4
+PKG_MD5SUM:=0ef00a095359e5af313f52446ebfbbf1
 
-PKG_SOURCE_URL:=http://snapshots.madwifi.org
-PKG_SOURCE:=$(PKG_NAME)-trunk-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng
+PKG_SOURCE:=$(PKG_NAME)-ng-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-trunk-$(PKG_VERSION)
-
-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-ng-$(PKG_VERSION)
 
 ifeq ($(ARCH),mips)
 HAL_TARGET:=mips-be-elf
@@ -28,9 +24,17 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
+ifneq ($(BR2_LINUX_2_4_AR531X),)
+       BUS := AHB
+       bus := ahb
+else
+       BUS := PCI
+       bus := pci
+endif
+
 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 $@
@@ -42,7 +46,9 @@ $(PKG_BUILD_DIR)/.built:
                CROSS_COMPILE="$(TARGET_CROSS)" \
                TARGET="$(HAL_TARGET)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
-               KERNELPATH="$(KERNEL_DIR)" \
+               TOOLPATH="$(KERNEL_CROSS)" \
+               KERNELPATH="$(LINUX_DIR)" \
+               BUS="$(BUS)" \
                all
        touch $@
 
@@ -54,8 +60,9 @@ $(IPKG_KMOD_MADWIFI):
        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
        cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-               $(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(LINUX_KMOD_SUFFIX) \
-               $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath/ath_$(bus).$(LINUX_KMOD_SUFFIX) \
+               $(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)/
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)