Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/lfs/madwifi b/lfs/madwifi
index 187758d3cf0d5094aa30085d59ae0fe71520bae8..086454b90f5b3ddf67730deccba4ba947dd9a2f9 100644 (file)
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,16 +24,16 @@
 
 include Config
 
-VER        = 0.9.4
+VER        = hal-0.10.5.6-r3879-20081204
 
 THISAPP    = madwifi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)-wlan
+  TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
 else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-wlan-smp
+  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
 endif
 
 ###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 399d20de8d855a59f20058857c2178ad
+$(DL_FILE)_MD5 = bc9657269748cd576f258ceda31eb3a7
 
 install : $(TARGET)
 
@@ -74,16 +74,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(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
+       cd $(DIR_APP) && make $(MAKETUNING) KERNELPATH=/usr/src/linux
+       cd $(DIR_APP) && make KERNELPATH=/usr/src/linux BINDIR=/usr/bin \
+                               MANDIR=/usr/man install
 ifeq "$(SMP)" ""
        cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
        ln -s $(DIR_APP) $(DIR_SRC)/madwifi 
 endif
+       # Set Countrycode to germany because some cards
+       # are not detected without cc
+       echo options ath_pci countrycode=276 > /etc/modprobe.d/madwifi
        @$(POSTBUILD)