X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=7c77f92f0a91fd4f31f43a8b91d52638bab41cb8;hb=befea07ccaab3fab012f6d3bea1e7e2352afd1c1;hp=bc3dd64eb7e69668e80529463227781caab7cb9c;hpb=999d55de0585b62235a43731a6b942082f96c404;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index bc3dd64eb..7c77f92f0 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = 2009-03-30
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = 2009-06-30
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 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 = 88ea3e5b42ef5fbcec8b91043dd3aa76
+$(DL_FILE)_MD5 = 68777ce2aa6b28dc3d37fc2b9a3a6d70
 
 install : $(TARGET)
 
@@ -75,12 +77,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+	# Xen
+ifeq "$(XEN)" "1"
+#       some dirty hacks that it is building
+	mv /usr/src/linux/include/linux/tracepoint.h /usr/src/linux/include/linux/tracepoint.h.xen
+	touch /usr/src/linux/include/linux/tracepoint.h
+	cd /usr/src/ &&  patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-1.patch
+endif
+
 #	Apply some wlan-card patches
-	cd $(DIR_APP) && cat $(DIR_SRC)/src/patches/compat-wireless_*.patch | patch -Np1
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
 
-	cd $(DIR_APP) && sed -i -e "s|uname -r|echo $(KVER)-ipfire|g" Makefile
-	cd $(DIR_APP) && sed -i -e "s|/sbin/modprobe|echo|g" Makefile
+#	Build only the modules
 	cd $(DIR_APP) && sed -i -e "s|install: uninstall modules|install: modules|g" Makefile
 	cd $(DIR_APP) && sed -i -e "s|\t@# All the scripts|\nende:|g" Makefile
-	cd $(DIR_APP) && make KMODDIR=kernel install
+
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install
+
+	# Xen
+ifeq "$(XEN)" "1"
+#       remove dirty hacks. restores to the status before the dirty hacks
+	cd /usr/src/ &&  patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-2.patch
+	mv /usr/src/linux/include/linux/tracepoint.h.xen /usr/src/linux/include/linux/tracepoint.h
+endif
+
+	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
+	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
 	@$(POSTBUILD)
+