Add hvm USE flag for Xen, mask on amd64 no-multilib

7 files changed, 33 insertions, 5 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8f104193c4fc..a6f4227febb8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.592 2007/08/24 21:51:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.593 2007/08/24 23:18:51 marineam Exp $
+
+  24 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  default-linux/amd64/2006.0/no-multilib/use.mask,
+  default-linux/amd64/2006.1/no-multilib/use.mask,
+  default-linux/amd64/2007.0/no-multilib/use.mask,
+  hardened/amd64/multilib/use.mask, hardened/amd64/use.mask, use.local.desc:
+  Add hvm USE flag for Xen HVM support in xen-tools. Mask on no-multilib
+  profiles.
 
   24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> use.local.desc:
   Added cern local USE flag to sci-physics/root
diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/use.mask b/profiles/default-linux/amd64/2006.0/no-multilib/use.mask
index 8ba991d72a26..6b45071f1df0 100644
--- a/profiles/default-linux/amd64/2006.0/no-multilib/use.mask
+++ b/profiles/default-linux/amd64/2006.0/no-multilib/use.mask
@@ -15,3 +15,7 @@ teamarena
 # 2007/05/16 Joseph Jezak <josejx@gentoo.org>
 # mplayer-bin is 32 bit only
 mplayer-bin
+
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support requires building 32-bit binaries.
+hvm
diff --git a/profiles/default-linux/amd64/2006.1/no-multilib/use.mask b/profiles/default-linux/amd64/2006.1/no-multilib/use.mask
index 8ba991d72a26..6b45071f1df0 100644
--- a/profiles/default-linux/amd64/2006.1/no-multilib/use.mask
+++ b/profiles/default-linux/amd64/2006.1/no-multilib/use.mask
@@ -15,3 +15,7 @@ teamarena
 # 2007/05/16 Joseph Jezak <josejx@gentoo.org>
 # mplayer-bin is 32 bit only
 mplayer-bin
+
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support requires building 32-bit binaries.
+hvm
diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/use.mask b/profiles/default-linux/amd64/2007.0/no-multilib/use.mask
index 8ba991d72a26..6b45071f1df0 100644
--- a/profiles/default-linux/amd64/2007.0/no-multilib/use.mask
+++ b/profiles/default-linux/amd64/2007.0/no-multilib/use.mask
@@ -15,3 +15,7 @@ teamarena
 # 2007/05/16 Joseph Jezak <josejx@gentoo.org>
 # mplayer-bin is 32 bit only
 mplayer-bin
+
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support requires building 32-bit binaries.
+hvm
diff --git a/profiles/hardened/amd64/multilib/use.mask b/profiles/hardened/amd64/multilib/use.mask
index ee7ee42fc87a..ce8149f9055e 100644
--- a/profiles/hardened/amd64/multilib/use.mask
+++ b/profiles/hardened/amd64/multilib/use.mask
@@ -1,5 +1,9 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/multilib/use.mask,v 1.1 2005/12/06 12:33:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/multilib/use.mask,v 1.2 2007/08/24 23:18:52 marineam Exp $
 
 -multilib
+
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support, masked on no-multilib but ok here
+-hvm
diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index e086323d9a83..b7dccc606b3f 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.26 2007/06/22 18:53:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.27 2007/08/24 23:18:52 marineam Exp $
 
 multilib
 
@@ -53,6 +53,10 @@ kdexdeltas
 
 # WON'T BUILD - SECTION
 
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support requires building 32-bit binaries.
+hvm
+
 # 2007/01/18 - Jeffrey Gardner <je_fro@gentoo.org>
 # Mask gamess support temporarily.
 gamess
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 91f33106eb5e..ec18ed90e07a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2990 2007/08/24 21:51:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2991 2007/08/24 23:18:51 marineam Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -148,9 +148,9 @@ app-emulation/virtualbox:sdk - Enable building of SDK
 app-emulation/virtualbox:vboxbfe - Install simple SDL frontend useful for debugging purposes
 app-emulation/virtualbox:vditool - Install the Virtual Disk Image Manager vditool
 app-emulation/xen-tools:custom-cflags - Use CFLAGS from /etc/make.conf rather than the default Xen CFLAGS (not supported)
+app-emulation/xen-tools:hvm - Enable support for hardware based virtualization (VT-x, AMD-v)
 app-emulation/xen-tools:pygrub - Install the pygrub boot loader
 app-emulation/xen-tools:screen - Enable support for running domain U consoles in a screen session
-app-emulation/xen-tools:vnc - Enable support for VNC as a video device for domainUs
 app-emulation/xen-tools:ioemu - Enable support for emulated io devices including video via VNC for domainUs
 app-emulation/xen:custom-cflags - Use CFLAGS from /etc/make.conf rather than the default Xen CFLAGS (not supported)
 app-emulation/xen:pae - Enable support for PAE kernels (usually x86-32 with >4GB memory)