X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/fc35f54386655faec7483c691ca12c00c226a813..37a3e9fa619ba8148e973eb8d2db6d9b0c5b61d5:/package/madwifi/Makefile diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 874438b29..48fa28e12 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_REV:=3314 +PKG_REV:=$(if $(CONFIG_MADWIFI_TESTING),3776,3314) PKG_VERSION:=r$(PKG_REV) # PKG_BRANCH:=madwifi-dfs PKG_RELEASE:=1 @@ -23,6 +23,8 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) +PATCH_DIR=$(if $(CONFIG_MADWIFI_TESTING),./patches-testing,./patches) + include $(INCLUDE_DIR)/package.mk ifneq ($(CONFIG_TARGET_atheros),) @@ -118,7 +120,7 @@ ifeq ($(findstring PCI,$(BUS)),PCI) MADWIFI_AUTOLOAD+= ath_pci endif -MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig +MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig,$(if $(CONFIG_MADWIFI_TESTING),ath_info/)ath_info ifdef CONFIG_MADWIFI_DEBUG MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug endif @@ -151,10 +153,14 @@ MAKE_ARGS:= \ KERNELPATH="$(LINUX_DIR)" \ LDOPTS="--no-warn-mismatch " \ ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - WARNINGS="-Wno-unused" \ - $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG="") \ DO_MULTI=1 +ifneq ($(CONFIG_MADWIFI_TESTING),) + MAKE_ARGS += $(if $(CONFIG_MADWIFI_DEBUG),,ATH_DEBUG=) +else + MAKE_ARGS += $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" +endif + MAKE_VARS:= \ COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \