Changeset 12047


Ignore:
Timestamp:
2008-07-31T19:27:55+02:00 (8 years ago)
Author:
nbd
Message:

madwifi: add 0.9.4 madwifi as a menuconfig option, as requested in some mails/tickets
untested, does not work with 2.6.26

Location:
trunk/package/madwifi
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/Config.in

    r11851 r12047  
    66        default n 
    77 
     8choice 
     9        prompt "Madwifi version" 
     10        depends on PACKAGE_kmod-madwifi 
     11        default MADWIFI_STABLE 
     12        help 
     13          This option allows you to select the version of MadiWifi to be built. 
     14 
     15config MADWIFI_STABLE 
     16        bool "Use the OpenWrt stable version of madwifi" 
     17 
    818config MADWIFI_TESTING 
    9         bool "Use the testing version of MadWiFi" 
    10         depends on PACKAGE_kmod-madwifi 
    11         default n 
    12         help 
    13           Use the testing version of MadWiFi, which is newer, but also less tested 
    14           May contain unexpected bugs :) 
     19        depends BROKEN 
     20        bool "Use the OpenWrt testing version of madwifi" 
     21 
     22config MADWIFI_UPSTREAM 
     23        depends !LINUX_2_6_26 
     24        bool "Use the upstream release version 0.9.4" 
     25 
     26endchoice 
    1527 
    1628choice 
  • trunk/package/madwifi/Makefile

    r12005 r12047  
    1111 
    1212PKG_NAME:=madwifi 
    13 PKG_REV:=$(if $(CONFIG_MADWIFI_TESTING),3776,3314) 
    14 PKG_VERSION:=r$(PKG_REV) 
     13 
     14ifneq ($(CONFIG_MADWIFI_UPSTREAM),) 
     15  PKG_VERSION:=0.9.4 
     16  PKG_RELEASE:=1 
     17 
     18  PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz 
     19  PKG_SOURCE_URL:=http://downloads.sourceforge.net/madwifi/ 
     20  PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad 
     21 
     22  PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) 
     23 
     24  PATCH_DIR=./patches-upstream 
     25else 
    1526# PKG_BRANCH:=madwifi-dfs 
    16 PKG_RELEASE:=1 
    17  
    18 PKG_SOURCE_PROTO:=svn 
    19 PKG_SOURCE_VERSION:=$(PKG_REV) 
    20 PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) 
    21 PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) 
    22 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz 
    23  
    24 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) 
    25  
    26 PATCH_DIR=$(if $(CONFIG_MADWIFI_TESTING),./patches-testing,./patches) 
     27  PKG_REV:=$(if $(CONFIG_MADWIFI_TESTING),3776,3314) 
     28  PKG_VERSION:=r$(PKG_REV) 
     29  PKG_RELEASE:=1 
     30 
     31  PKG_SOURCE_PROTO:=svn 
     32  PKG_SOURCE_VERSION:=$(PKG_REV) 
     33  PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) 
     34  PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) 
     35  PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz 
     36 
     37  PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) 
     38 
     39  PATCH_DIR=$(if $(CONFIG_MADWIFI_TESTING),./patches-testing,./patches) 
     40endif 
    2741 
    2842include $(INCLUDE_DIR)/package.mk 
     
    121135endif 
    122136 
    123 MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig,$(if $(CONFIG_MADWIFI_TESTING),ath_info/)ath_info 
     137MADWIFI_APPLETS:=80211stats athchans athctrl athkey athstats wlanconfig $(if $(CONFIG_MADWIFI_TESTING),ath_info/)ath_info 
    124138ifdef CONFIG_MADWIFI_DEBUG 
    125   MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug 
    126 endif 
    127  
     139  MADWIFI_APPLETS += athdebug 80211debug 
     140endif 
     141ifndef CONFIG_MADWIFI_UPSTREAM 
     142  MADWIFI_APPLETS += madwifi_multi 
     143endif 
    128144 
    129145define KernelPackage/madwifi 
     
    165181        COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \ 
    166182 
    167 HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) 
     183ifeq ($(CONFIG_MADWIFI_UPSTREAM),) 
     184  HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) 
     185endif 
     186 
    168187ifneq ($(HALFILE),) 
    169   define Build/Prepare 
    170         $(call Build/Prepare/Default) 
     188  define Build/Prepare/HAL 
    171189        rm -rf $(PKG_BUILD_DIR)/tmp 
    172190        mkdir -p $(PKG_BUILD_DIR)/tmp 
     
    174192        $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ 
    175193        rm -rf $(PKG_BUILD_DIR)/tmp 
     194  endef 
     195endif 
     196 
     197define Build/Prepare 
     198        $(call Build/Prepare/Default) 
     199        $(call Build/Prepare/HAL) 
    176200        # patch cflags 
    177201        $(SED) 's, -E[LB],,' \ 
     
    181205        $(SED) 's,march=armv4,march=armv5te,' \ 
    182206                $(PKG_BUILD_DIR)/hal/public/xscale*.inc 
    183   endef 
    184 endif 
     207endef 
    185208 
    186209ifeq ($(findstring AHB,$(BUS)),AHB) 
     
    217240        $(INSTALL_DIR) $(1)/usr/sbin 
    218241        $(CP) ./files/* $(1)/ 
    219         $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,$(MADWIFI_APPLETS)} $(1)/usr/sbin/ 
     242        $(CP) $(foreach applet,$(MADWIFI_APPLETS),$(PKG_BUILD_DIR)/tools/$(applet)) $(1)/usr/sbin/ 
    220243endef 
    221244 
Note: See TracChangeset for help on using the changeset viewer.