From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 10 Jan 2011 10:39:34 +0000 (+0100)
Subject: xen: Fix build with newer kernels.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5513345750b18b3a01ea830abcfaf42bb18c3d;p=ipfire-3.x.git

xen: Fix build with newer kernels.

Squashed commit of the following:

commit 0f45e52d39523040a3f4f1adcae1dfc6390d33fe
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Sat Jan 8 15:50:46 2011 +0100

    Xen: removed xen-detect package and xen-detect is now in xen-runtimes.

commit 488b0676070270b6459050d35cb0efeeaff60935
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Sat Jan 8 15:37:04 2011 +0100

    libvirt: fixed xen-tools dependencies.

commit 4fe8b5bf1ef19165e9959aba8f2d7f80459d9195
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Sat Jan 8 15:32:35 2011 +0100

    Xen: added extra package for xen-detect and fixed a error with \
    WRITE definition.
---

diff --git a/pkgs/core/xen/patches/xen-WRITE.patch b/pkgs/core/xen/patches/xen-WRITE.patch
new file mode 100644
index 000000000..eb4f062ab
--- /dev/null
+++ b/pkgs/core/xen/patches/xen-WRITE.patch
@@ -0,0 +1,23 @@
+diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap/drivers/blk_linux.c
+--- xen-4.0.1/tools/blktap/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000
++++ xen-4.0.1/tools/blktap/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000
+@@ -1,6 +1,6 @@
+ #include <inttypes.h>
+ #include <sys/ioctl.h>
+-#include <linux/fs.h>
++#include <sys/mount.h>
+ #include "tapdisk.h"
+ #include "blk.h"
+ 
+diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap2/drivers/blk_linux.c
+--- xen-4.0.1/tools/blktap2/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000
++++ xen-4.0.1/tools/blktap2/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000
+@@ -1,7 +1,7 @@
+ #include <inttypes.h>
++#include <errno.h>
+ #include <sys/ioctl.h>
+-#include <linux/fs.h>
+-#include <linux/errno.h>
++#include <sys/mount.h>
+ #include "tapdisk.h"
+ #include "blk.h" 
diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm
index 2848452f0..1c71ce3ca 100644
--- a/pkgs/core/xen/xen.nm
+++ b/pkgs/core/xen/xen.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = xen
 PKG_VER        = 4.0.1
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER = Ben Schweikert <ben.schweikert@ipfire.org>
 PKG_GROUP      = Applications/Virtualization
@@ -40,8 +40,9 @@ define PKG_DESCRIPTION
        feature set for virtualization.
 endef
 
-PKG_BUILD_DEPS+= gettext-devel libuuid-devel openssl-devel python python-devel \
-	sdl-devel xorg-x11-proto-devel zlib-devel
+PKG_BUILD_DEPS+= gettext-devel kernel-headers libuuid-devel ncurses-devel \
+	openssl-devel python python-devel sdl-devel xorg-x11-proto-devel \
+	zlib-devel
 
 PKG_TARBALL    = $(THISAPP).tar.gz