Updated madwifi to lastest stable.

[people/pmueller/ipfire-2.x.git] / lfs / madwifi

diff --git a/lfs/madwifi b/lfs/madwifi
index 1ea024f12d7272c5ce88f65ac69e26dc2ec0eb46..0777372f714358e0790ad3f7c6a5933c12702242 100644 (file)
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = svn3841
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = hal-0.10.5.6-r4119-20100201
 
 THISAPP    = madwifi-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)-wlan
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-wlan-smp
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 60c8ce7553b55eff618b49aeee3bc3b5
+$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63
 
 install : $(TARGET)
 
@@ -73,17 +75,21 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i -e "s/\/sbin\/depmod -ae//" Makefile
-       cd $(DIR_APP) && sed -i -e "94,96d" Makefile
-       # workaround for build on lfs
-       ln -s $(DIR_APP)/net80211/if_ethersubr.h $(DIR_APP)/ath/if_ethersubr.h
-       ln -s $(DIR_APP)/net80211/if_media.h $(DIR_APP)/ath/if_media.h
-       ln -s $(DIR_APP)/net80211/if_llc.h $(DIR_APP)/ath/if_llc.h
-       cd $(DIR_APP) && make KERNELPATH=/usr/src/linux
-       cd $(DIR_APP) && make install KERNELPATH=/usr/src/linux
-ifeq "$(SMP)" ""
-       cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
-       ln -s $(DIR_APP) $(DIR_SRC)/madwifi 
-endif
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(MAKETUNING) KERNELPATH=/usr/src/linux
+       cd $(DIR_APP) && make KERNELPATH=/usr/src/linux BINDIR=/usr/bin \
+                               MANDIR=/usr/man install
+       cp -f $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
+       ln -sf $(DIR_APP) $(DIR_SRC)/madwifi 
+
+       # Add comment to set CountryCode to germany because some cards
+       # are not detected without cc but others doesn't like this
+       echo '#options ath_pci countrycode=276' > /etc/modprobe.d/madwifi
+       # Blacklist ath5k or madwifi for switching between the drivers
+       echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi
+       echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi
+
+       # create madwifi symlink for hostapd build
+       cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi
+
        @$(POSTBUILD)