X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fmadwifi;h=8f0ff0a3a77b580502a09060fd2e9f5f67cb52c3;hp=187758d3cf0d5094aa30085d59ae0fe71520bae8;hb=df2a9a46c7db6362520343d6ec70fbcfe40b2795;hpb=fad7b108e2e765fae9141122266cc6b558711684

diff --git a/lfs/madwifi b/lfs/madwifi
index 187758d3cf..8f0ff0a3a7 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = 0.9.4
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = hal-0.10.5.6-r4031-20090529
 
 THISAPP    = madwifi-$(VER)
 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 = 399d20de8d855a59f20058857c2178ad
+$(DL_FILE)_MD5 = af13564a45bb6fbb1d8834ed528a0a59
 
 install : $(TARGET)
 
@@ -74,16 +76,20 @@ $(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
-ifeq "$(SMP)" ""
-	cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
-	ln -s $(DIR_APP) $(DIR_SRC)/madwifi 
-endif
+	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)