diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-19 15:16:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-19 15:16:11 +0000 |
| commit | fe78c4885c4eee435a20d88a0e6ab69c3a934501 (patch) | |
| tree | e7aea2c242fc62b8deeb7d7963c931f2cf7daefa /package/madwifi/Makefile | |
| parent | 6fb461da2bd74ff73e7138e2bc41d446232a0534 (diff) | |
| download | upstream-fe78c4885c4eee435a20d88a0e6ab69c3a934501.tar.gz upstream-fe78c4885c4eee435a20d88a0e6ab69c3a934501.tar.bz2 upstream-fe78c4885c4eee435a20d88a0e6ab69c3a934501.zip | |
remove support for the madwifi upstream release, it doesn't work on newer kernels and it's not very reliable anyway
SVN-Revision: 17315
Diffstat (limited to 'package/madwifi/Makefile')
| -rw-r--r-- | package/madwifi/Makefile | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 632b77fec5..1a5b6c2b92 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,33 +10,17 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -ifneq ($(CONFIG_MADWIFI_UPSTREAM),) - PKG_VERSION:=0.9.4 - PKG_RELEASE:=2 +PKG_REV:=3314 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=2 - PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=@SF/madwifi - PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) - - PATCH_DIR=./patches-upstream -else -# PKG_BRANCH:=madwifi-dfs - PKG_REV:=3314 - PKG_VERSION:=r$(PKG_REV) - PKG_RELEASE:=2 - - PKG_SOURCE_PROTO:=svn - PKG_SOURCE_VERSION:=$(PKG_REV) - PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) - PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) - PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz - - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) - - PATCH_DIR=./patches -endif +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) HAL_VERSION:=20090508 HAL_FILE:=ath_hal-$(HAL_VERSION).tgz @@ -77,10 +61,10 @@ ifneq ($(CONFIG_CPU_MIPS32_R2),) endif else ifeq ($(ARCH),mips) - HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-be-elf,mips32-be-elf) + HAL_TARGET:=mips32-be-elf endif ifeq ($(ARCH),mipsel) - HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-le-elf,mips32-le-elf) + HAL_TARGET:=mips32-le-elf endif endif ifeq ($(ARCH),i386) @@ -165,13 +149,10 @@ ifeq ($(findstring PCI,$(BUS)),PCI) MADWIFI_AUTOLOAD+= ath_pci endif -MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info +MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info madwifi_multi ifdef CONFIG_MADWIFI_DEBUG MADWIFI_APPLETS += athdebug 80211debug endif -ifndef CONFIG_MADWIFI_UPSTREAM - MADWIFI_APPLETS += madwifi_multi -endif define KernelPackage/madwifi SUBMENU:=Wireless Drivers @@ -220,15 +201,13 @@ MAKE_ARGS:= \ MAKE_VARS:= \ COPTS="-DATH_REVERSE_ENGINEERING=1" \ -ifeq ($(CONFIG_MADWIFI_UPSTREAM),) - define Build/Prepare/HAL +define Build/Prepare/HAL rm -rf $(PKG_BUILD_DIR)/tmp mkdir -p $(PKG_BUILD_DIR)/tmp tar xvzf $(DL_DIR)/$(HAL_FILE) -C $(PKG_BUILD_DIR)/tmp $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ rm -rf $(PKG_BUILD_DIR)/tmp - endef -endif +endef define Build/Prepare $(call Build/Prepare/Default) |