X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmadwifi;h=6d657cc383e9e7f767ca165d2eedbfdfd5de2a46;hb=2b2e03eded667aea41f564e4ea982cdf77a32f08;hp=25cdffc806ea423869ad9f96781efc754d3c49b6;hpb=fe114e34880fc40cf19d2ea6b4bdefa2c24b9254;p=ipfire-2.x.git

diff --git a/lfs/madwifi b/lfs/madwifi
index 25cdffc806..6d657cc383 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = hal-2008-08-15-r3862-20080903
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = hal-testing-r4003-20090416
 
 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 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3c9726acd5ffa180fa7b274b625a6082
+$(DL_FILE)_MD5 = f9c591f16746a4ac4988ccbfedfe1a85
 
 install : $(TARGET)
 
@@ -77,11 +79,14 @@ $(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
+	cp -f $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
+	ln -sf $(DIR_APP) $(DIR_SRC)/madwifi 
+
 	# Set Countrycode to germany because some cards
 	# are not detected without cc
 	echo options ath_pci countrycode=276 > /etc/modprobe.d/madwifi
+
+	# create madwifi symlink for hostapd build
+	cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi
+
 	@$(POSTBUILD)