Update to Xen 4.1.2

Fixes/features include:
 * New XL toolstack
 * kexec/kdump
 * Remus
 * Device passthrough to HVM guests
 * Interrupt handling
 * Support for Supervisor Mode Execution Protection (SMEP)

6 files changed, 15 insertions, 39 deletions

diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile
index a6a1ed02158..8e91dd3d4f2 100644
--- a/sysutils/xenkernel41/Makefile
+++ b/sysutils/xenkernel41/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2011/10/16 20:32:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/21 18:26:58 cegger Exp $
 #
 
-VERSION=	4.1.1
+VERSION=	4.1.2
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel41-${VERSION}
 #PKGREVISION=	1
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	cegger@NetBSD.org
 HOMEPAGE=	http://xen.org/
-COMMENT=	Xen 4.1.1 Kernel
+COMMENT=	Xen 4.1.2 Kernel
 
 LICENSE=        gnu-gpl-v2
 
@@ -29,7 +29,7 @@ PYTHON_FOR_BUILD_ONLY=	# empty
 PY_PATCHPLIST=		NO
 
 # XXX Why does this not work?
-# See work/xen-4.1.1/Config.mk:41 why PYTHON must be set and what for
+# See work/xen-4.1.2/Config.mk:41 why PYTHON must be set and what for
 MAKE_ENV+=	PYTHON=${PYTHONBIN:Q}
 MAKE_ENV+=	OCAML_TOOLS=no
 
@@ -38,7 +38,7 @@ INSTALLATION_DIRS=	xen41-kernel
 do-build:
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} debug=n xen
 	${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen.gz
-	cd ${WRKSRC} && ${MAKE_PROGRAM} clean
+	cd ${WRKSRC}/xen && ${MAKE_PROGRAM} clean
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} debug=y xen
 	${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen-debug.gz
 
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo
index 30dfa69c078..303c27620d7 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/08/14 20:42:40 abs Exp $
+$NetBSD: distinfo,v 1.6 2011/10/21 18:26:58 cegger Exp $
 
-SHA1 (xen-4.1.1.tar.gz) = f1b5ef4b663c339faf9c77fc895327cfbcc9776c
-RMD160 (xen-4.1.1.tar.gz) = 4b3c0641b0f098889f627662aa6b8fea00c5b636
-Size (xen-4.1.1.tar.gz) = 10355625 bytes
+SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e
+RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6
+Size (xen-4.1.2.tar.gz) = 10365786 bytes
 SHA1 (patch-xen_drivers_char_console_c) = 0fe186369602ccffaeec6f4bfbee8bb4298d3ff0
 SHA1 (patch-xen_include_xen_stdarg.h) = e9df974a9b783ed442ab17497198432cb9844b70
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 338ff7551e6..2ecf4b69715 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2011/10/03 16:58:58 sborrill Exp $
+$NetBSD: distinfo,v 1.10 2011/10/21 18:27:21 cegger Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
 Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
-SHA1 (xen-4.1.1.tar.gz) = f1b5ef4b663c339faf9c77fc895327cfbcc9776c
-RMD160 (xen-4.1.1.tar.gz) = 4b3c0641b0f098889f627662aa6b8fea00c5b636
-Size (xen-4.1.1.tar.gz) = 10355625 bytes
+SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e
+RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6
+Size (xen-4.1.2.tar.gz) = 10365786 bytes
 SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada
 SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
@@ -32,7 +32,5 @@ SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41
 SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca
 SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
 SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
-SHA1 (patch-dd) = b0c6253a77c09c8625bc9425742b395d1ce67010
-SHA1 (patch-de) = b118ff85070cac7cd81375d2f59ad10b719ae263
 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
 SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7
diff --git a/sysutils/xentools41/patches/patch-dd b/sysutils/xentools41/patches/patch-dd
deleted file mode 100644
index 4fe8318a9c6..00000000000
--- a/sysutils/xentools41/patches/patch-dd
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-dd,v 1.1 2011/05/07 18:39:06 tnn Exp $
-
---- ../tools/examples/Makefile.orig	2011-03-25 10:42:50.000000000 +0000
-+++ ../tools/examples/Makefile
-@@ -1,5 +1,6 @@
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-+XEN_CONFIG_DIR=${EGDIR}
- 
- # Init scripts.
- XEND_INITD = init.d/xend
diff --git a/sysutils/xentools41/patches/patch-de b/sysutils/xentools41/patches/patch-de
deleted file mode 100644
index 5f11efcc9da..00000000000
--- a/sysutils/xentools41/patches/patch-de
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-de,v 1.1 2011/05/07 18:39:06 tnn Exp $
-
---- ../tools/hotplug/common/Makefile.orig	2011-03-25 10:42:50.000000000 +0000
-+++ ../tools/hotplug/common/Makefile
-@@ -1,5 +1,6 @@
- XEN_ROOT = ../../..
- include $(XEN_ROOT)/tools/Rules.mk
-+XEN_SCRIPT_DIR = ${EGDIR}/scripts
- 
- HOTPLUGPATH="hotplugpath.sh"
- 
diff --git a/sysutils/xentools41/version.mk b/sysutils/xentools41/version.mk
index 6fcc60bacde..86340910aee 100644
--- a/sysutils/xentools41/version.mk
+++ b/sysutils/xentools41/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.1 2011/10/03 16:58:04 sborrill Exp $
+# $NetBSD: version.mk,v 1.2 2011/10/21 18:27:21 cegger Exp $
 
 # Version number is used by xentool41 and xenstoretools
 
-VERSION=	4.1.1
+VERSION=	4.1.2