X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmadwifi;h=90f1a1c67ed7a0d8233633db864ccaeb2d7a212a;hb=7fb1b9f680b91b0f3446172c07de7c4e9c106001;hp=5aeb39cec8fe1f200021226854cfb508a49a0b08;hpb=055f2609796bb6af4132fafc34fe0231638a5256;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/madwifi b/lfs/madwifi
index 5aeb39cec8..90f1a1c67e 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,24 @@
 
 include Config
 
-VER        = trunk-r3994-20090410
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+endif
+
+VER        = hal-0.10.5.6-r4119-20100201
 
 THISAPP    = madwifi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9dbd2c1fd3f1aa53f4bdc64531192587
+$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63
 
 install : $(TARGET)
 
@@ -77,15 +84,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	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
+	echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi
 
 	# create madwifi symlink for hostapd build
-	cd $(DIR_SRC) && ln -s $(THISAPP) madwifi
+	cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi
 
 	@$(POSTBUILD)