Set dom0-min-mem to kb wrt Bug #472982 by PatomaS

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 40 insertions, 3 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 0ea25de02b81..89dc36c98756 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.158 2013/06/27 13:21:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.159 2013/06/27 15:15:54 idella4 Exp $
+
+  27 Jun 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4.2-configsxp.patch,
+  xen-tools-4.2.1-r3.ebuild, xen-tools-4.2.1-r4.ebuild,
+  xen-tools-4.2.2-r1.ebuild, xen-tools-4.2.2-r2.ebuild:
+  Set dom0-min-mem to kb wrt Bug #472982 by PatomaS
 
   27 Jun 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r3.ebuild,
   xen-tools-4.2.1-r4.ebuild, xen-tools-4.2.2-r1.ebuild,
diff --git a/app-emulation/xen-tools/files/xen-4.2-configsxp.patch b/app-emulation/xen-tools/files/xen-4.2-configsxp.patch
new file mode 100644
index 000000000000..4c159c17a0a4
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2-configsxp.patch
@@ -0,0 +1,24 @@
+diff -ur xen-4.2.1.orig/tools/examples/xend-config.sxp xen-4.2.1/tools/examples/xend-config.sxp
+--- tools/examples/xend-config.sxp	2012-12-17 23:00:23.000000000 +0800
++++ tools/examples/xend-config.sxp	2013-06-27 21:32:50.198221774 +0800
+@@ -200,7 +200,7 @@
+ #(network-script network-nat)
+ #(vif-script     vif-nat)
+ 
+-# dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
++# dom0-min-mem is the lowest permissible memory level (in kb) for dom0.
+ # This is a minimum both for auto-ballooning (as enabled by
+ # enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
+ (dom0-min-mem 196)
+diff -ur xen-4.2.1.orig/tools/python/xen/xend/tests/xend-config.sxp xen-4.2.1/tools/python/xen/xend/tests/xend-config.sxp
+--- tools/python/xen/xend/tests/xend-config.sxp	2012-12-17 23:01:27.000000000 +0800
++++ tools/python/xen/xend/tests/xend-config.sxp	2013-06-27 21:32:02.726225130 +0800
+@@ -116,7 +116,7 @@
+ 
+ 
+ # Dom0 will balloon out when needed to free memory for domU.
+-# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
++# dom0-min-mem is the lowest memory level (in kb) dom0 will get down to.
+ # If dom0-min-mem=0, dom0 will never balloon out.
+ (dom0-min-mem 196)
+ 
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild
index 350d4c6fdc4a..593069384541 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild,v 1.3 2013/06/27 13:21:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild,v 1.4 2013/06/27 15:15:54 idella4 Exp $
 
 EAPI=5
 
@@ -199,6 +199,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/xen-4-ulong.patch \
 		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
 
+	# Set dom0-min-mem to kb; Bug #472982
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
+
 	#Sec patches currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \
@@ -222,6 +225,8 @@ src_prepare() {
                 "${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-2072-XSA-56.patch \
 		"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch
+
+		epatch_user
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild
index 4723098039f3..1386a19d8c7c 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild,v 1.3 2013/06/27 13:21:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild,v 1.4 2013/06/27 15:15:54 idella4 Exp $
 
 EAPI=5
 
@@ -199,6 +199,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/xen-4-ulong.patch \
 		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
 
+	# Set dom0-min-mem to kb; Bug #472982
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
+
 	#Security patches, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \