X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=a8902f1c2ad6b4e8f5bac1d7438a24e6352f58c4;hb=a832f4f33ef12cd4245b5d50bc98b05db2dae2ca;hp=71f3bc9f31d510b070e3e8fcd28d6f6c1ba0b4ac;hpb=a806976e3618736e9054043eae2eb8e65e2bc626;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 71f3bc9f3..a8902f1c2 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -24,17 +24,9 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-	VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-	VERSUFIX=ipfire-xen
-else
-	VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
 
-VER        = 2.6.39-1-sn
+VER        = 3.0-2
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +43,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
+$(DL_FILE)_MD5 = 7f2d0de30bf9c3e9a941d9e67971e9b3
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
@@ -97,6 +89,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Build Updated asix usb-lan driver
 	cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	# B43+B44 driver doesn't build on arm
+#	cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk
+#	cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk
+	# Add libartas uAP driver
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.0-libertas_uap.patch
+	cd $(DIR_APP)&& echo CONFIG_LIBERTAS_UAP=m >> config.mk
+endif
+
 	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
 		KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules