Merge commit 'origin/xen'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Aug 2009 17:41:26 +0000 (19:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Aug 2009 17:41:26 +0000 (19:41 +0200)
1  2 
lfs/compat-wireless
lfs/linux
make.sh

@@@ -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)
diff --cc lfs/linux
Simple merge
diff --cc make.sh
Simple merge