From 274054142e3033aabf5cb1b89d86fa430dee5d72 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 25 Aug 2012 18:02:59 +0200
Subject: [PATCH 1/1] kernel: fix xen kernel build with updated toolchain.

---
 lfs/linux2 | 8 ++++----
 make.sh    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lfs/linux2 b/lfs/linux2
index f6df2b4b6..7f8b76b3e 100644
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -74,19 +74,19 @@ objects =$(DL_FILE) \
 	netfilter-layer7-v2.22.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
 	reiser4-for-2.6.32.patch.bz2 \
-	xen-patches-2.6.32-2f.tar.bz2
+	xen-patches-2.6.32-2g.tar.bz2
 
 $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
-xen-patches-2.6.32-2f.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
+xen-patches-2.6.32-2g.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2g.tar.bz2
 
 $(DL_FILE)_MD5				= 69c68c4a8eb0f04b051a7dbcff16f6d0
 netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
-xen-patches-2.6.32-2f.tar.bz2_MD5	= b59d6f89e11accb9d40354418e13f31b
+xen-patches-2.6.32-2g.tar.bz2_MD5	= d259a847c9aa73cd6e5c3605d9657d66
 
 install : $(TARGET)
 
@@ -124,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(KCFG)" "-xen"
 	# Apply gentoo Xen patches
 	mkdir -p $(DIR_SRC)/xen-patches
-	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
+	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2g.tar.bz2
 
 	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
 		echo "*********** [Patch: $$x]"; \
diff --git a/make.sh b/make.sh
index 9560594d1..07e93deb1 100755
--- a/make.sh
+++ b/make.sh
@@ -378,12 +378,12 @@ buildipfire() {
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-#    ipfiremake linux2			KCFG="-xen"
+    ipfiremake linux2			KCFG="-xen"
 #    ipfiremake v4l-dvb			KCFG="-xen"
 #    ipfiremake mISDN			KCFG="-xen"
-#    ipfiremake dahdi			KCFG="-xen" KMOD=1
-#    ipfiremake cryptodev		KCFG="-xen"
-#    ipfiremake compat-wireless		KCFG="-xen"
+    ipfiremake dahdi			KCFG="-xen" KMOD=1
+    ipfiremake cryptodev		KCFG="-xen"
+    ipfiremake compat-wireless		KCFG="-xen"
 #    ipfiremake r8169			KCFG="-xen"
 #    ipfiremake r8168			KCFG="-xen"
 #    ipfiremake r8101			KCFG="-xen"
-- 
2.39.2