From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Aug 2009 17:41:26 +0000 (+0200)
Subject: Merge commit 'origin/xen'
X-Git-Tag: v2.5-core30~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e827a986bbdb30913c73bb1c771565c772e3a6a;p=people%2Fstevee%2Fipfire-2.x.git

Merge commit 'origin/xen'
---

1e827a986bbdb30913c73bb1c771565c772e3a6a
diff --cc lfs/compat-wireless
index 6a2d23d40c,7c77f92f0a..5ad9422423
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@@ -86,11 -94,14 +94,19 @@@ endi
  
  	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
 +
 +	# Remove original kernel rtl818x modules (compat wireless use the
 +	# place of newer kernels and so not overwrite it...
 +	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
 +
  	@$(POSTBUILD)
+