[app-emulation/xen-tools] Fix borken emerge due to system header changes; bug #379815. Input from Ian Delaney aka idell4

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

5 files changed, 302 insertions, 15 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index b4cde7585999..3ea7ba0da20f 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.87 2011/09/18 17:03:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.88 2011/09/21 17:27:43 alexxy Exp $
+
+*xen-tools-3.4.2-r1 (21 Sep 2011)
+
+  21 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-3.4.2-r1.ebuild,
+  +files/xen-tools-3.4.2-fix-definitions.patch,
+  +files/xen-tools-3.4.2-fix-include.patch:
+  Fix borken emerge due to system header changes; bug #379815. Input from Ian
+  Delaney aka idell4
 
   18 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r5.ebuild:
   Fix patch name. Thanks to Sven Köhler
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 27cdfbfc148f..9c0486f8d656 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,6 +6,8 @@ AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5
 AUX xen-tools-3.3.1-sandbox-fix.patch 828 RMD160 6c637b0883b72f12ce33b9c6d2dc7cf5267fc85a SHA1 51b35f096c0ad5c83e9654cfe0267b8efc51367e SHA256 519236a71e81e1da1c9a7616745422e6f205f4f7901abba7af0e0aef665af343
 AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6f69d1d260c6fa6adad43e3 SHA1 cc02643eee7a39e97b53674066516c80ec0c3b38 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74
 AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
+AUX xen-tools-3.4.2-fix-definitions.patch 357 RMD160 dc8b56f962030147a0f38b6b1cd322a37554b2b1 SHA1 0a475f849ee45913720fadc748c55ef4720ff3cd SHA256 4360fd9e1db2103a8af432741d223320c2fed6369efd053f9eb93ae2f7213282
+AUX xen-tools-3.4.2-fix-include.patch 573 RMD160 c9b1a7720f7775e9bf4421b4d5effb711b72f169 SHA1 314d960e64aa84ce1860bc47b3898da628067dfd SHA256 3450c6cc9ca89a064061aa57b6f7e5d593243f6d51f31844638b25fb573ea956
 AUX xen-tools-4.1.1-libxl-tap.patch 1071 RMD160 a345fab381af82ffdf7a4206d9db30f6845e5867 SHA1 bbe2ddd9eb8119ae172fd9671fe58bda80bf9095 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885
 AUX xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 RMD160 7d3bd028c5da4b2a48f1e992900bbf1866c9c4ea SHA1 55c5476e632649d4d635db1023193216455d076d SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f
 AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
@@ -21,25 +23,26 @@ AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 983
 DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 SHA1 da052c8de5f3485fe0253c19cf52ed6d72528485 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
+EBUILD xen-tools-3.4.2-r1.ebuild 7296 RMD160 71efba76364ddb84a590172354d44d9cbe9d4db1 SHA1 bb839ea3f993d72eda2efedf9fa9c84dce27756a SHA256 7a6df3b65045b304d104bd71bf21190a332c70be5fa6d00c0ca48fb21ce7b4c5
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
 EBUILD xen-tools-4.1.1-r5.ebuild 9876 RMD160 91ca02b8248405104ebaaa78115054fbff8ec8da SHA1 570b4c64976ecbacdc7204da859feb069820959f SHA256 5389eda3315eff848c71c1dea463881061ea776d3343ed6f6ffd3168ea81c51c
 EBUILD xen-tools-9999.ebuild 9682 RMD160 2f60aa64bb720767cee6b7a88a421613f92dcf02 SHA1 69a5487f75dd757d5da96bb2339c38819fe6d4d6 SHA256 20770f7c8a02ea141be8a8772624e6dcf8266dbee477b31e87f265695b939a69
-MISC ChangeLog 21226 RMD160 85cc91f217bb8f85cf8c3b0e48738456457fb6bf SHA1 73986cb95aecbc79d60f60ab4dd5c902ac64f1b1 SHA256 25d80a29836e2f0083163c33cd7882fcc1adf581a363160cc737ede25590db75
+MISC ChangeLog 21532 RMD160 845aab057b04e00cead311f980f85b07231356ad SHA1 e9b70dae52765580a039ea7fcaba9eb23bddd02e SHA256 48bfcd489535e9fbd3975483db07aaaba90055f0e5cec97a6ac73d1d15e085a2
 MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOdiQoAAoJEOf+E+/4L5LmBfEQAKcd28iEYQkDjn3h4kbT9B5W
-03SXY/aOtzkq8K8Ly2k8d9GpAduilbtx8FCpIVYwffTbQ+vOjqqnlQJ7GglyqWT+
-su29IWFXba2LUdVL0fghzCzQoqdbXFOJ1bZdih7xDxZfIPyeGPEa6k8ruGL9RAyD
-u+B9BzEinRlmIOZlAumPDFn+o61scjNA+ee1Fp/EXLO4Txyq+YhESu6q10yJJwly
-2F/6c9aspNsa3+yQiM+oyI9O39bXHwlw34H/02JE+CHon9KNZTdYeUXpg5ZodAbN
-rnEtvrhYLmgsSJiaJ4E0MEKUqz6oZX76EMKDkfqAlBSkTwkR1tunI2c0h04c/cek
-gIrzZ2zQkbN4qy1TnSpwMxTIAC/aSZHpVYGK28AxtNg7b4wd5AOyrSB1INUrs3Gu
-DyPnL1FBX+hEdSzXLDosPCcfVwpr2B5vuQ6FJDGE6uAQqsL7g0sraPGuz/9UyHzj
-a8Ui1AlfvwNyneOk0G63p99oFK9Z20T/0egh8UFA+4A+WSOUZXlg3AcT2AMF2TGq
-GTFUqTdz2hZfRjZ8ud7+tt+3jX6jLxR6wPaJvErEGgJEXLZ3Iky4eBeNGnlDCIA/
-NPFQlMqeTfKDK2KslE6bpjIJKdZwQsEs77qvGj2wpWoxiX7vUW4p6D1HPnkHObl3
-kYsHM+RMHbt74sW4wvfW
-=kdQf
+iQIcBAEBCAAGBQJOeh5UAAoJEOf+E+/4L5Lm6JYQAJutYeXDfo2ovLKzzE9gaRly
+L5D9d4S7R2BPb6947pzyU4UDu/gLFG6dg60vM7z6Aek35uCaKJU4ddXmt9VXtB/6
+e/z6bxAcUEaXrS1pX2s14fJ9PhvDpQQR9DFvi7VDiVJP9z4SPUFQrPeYe8T5uTZo
+YiKAzLD7S3YO5Z8/cYjS77++J3IRt85La723vzgh0yGXoXZdDDvnBZbrar9bdJuP
+ADqyMORDP0D0LbcqhN/i3mTO/6OlOa0MtoBIDWL+mVoxqttTxG5Hge87Qx+Pmw1V
+mtQVnPVBfXf1p8uqDaIuf5zFVhoFGKmSMzVLdZIhSgqruAoPxxPP9JFEeUG/iO2l
+pubM4gAyIM80D994137gMvnYXoZjXBzfT4EieKHADYMeMJqgAHRMMvXjhisT8sME
+iC0TXjQCTe0lIsIYGk+OGcxf3kbD+dqWBiK+ivDANKrzfYE2SJo1zRmq/n7xRAE+
+2WLkGSQPv3w33hhiKCAReNxGClZ3+DEGqKqXdYtDsizH6Wpfb1XLg3LkqtpBPYtE
+3sCNc2AGVmnS/wnkzWvfA9l8b7kS9rea4k3PbDhsYSnAL86KgYRcZ+8G5me5oXhP
+6GJPR5Nz0br39hnm8xceJLETL32XhBjCTbZ+n1FM8VMuVsDqJ8B1Zh95NCo8u3YZ
+Bhb9ooiwhq4GAMh2gmrX
+=ZWru
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch
new file mode 100644
index 000000000000..cdcf5fecadee
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch
@@ -0,0 +1,16 @@
+--- tools/blktap/lib/blktaplib.h.orig	2011-09-21 19:29:30.240868534 +0800
++++ tools/blktap/lib/blktaplib.h	2011-09-21 19:34:21.184868372 +0800
+@@ -195,8 +195,13 @@
+ 	pid_t     pid;
+ } msg_pid_t;
+ 
++#ifndef READ
+ #define READ 0
++#endif
++
++ifndef WRITE
+ #define WRITE 1
++#endif
+ 
+ /*Control Messages between manager and tapdev*/
+ #define CTLMSG_PARAMS      1
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch
new file mode 100644
index 000000000000..5538cc2fb594
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch
@@ -0,0 +1,18 @@
+--- ./tools/blktap/drivers/blktapctrl.c	2011-09-20 00:27:01.846896986 +0800
++++ ./tools/blktap/drivers/blktapctrl.c	2011-09-20 00:29:09.910897067 +0800
+@@ -40,6 +40,7 @@
+ #include <err.h>
+ #include <errno.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <fcntl.h>
+--- ./tools/ioemu-qemu-xen/block-qcow2.c	2011-09-19 23:43:40.005898352 +0800
++++ ./tools/ioemu-qemu-xen/block-qcow2.c	2011-09-19 23:26:53.979898723 +0800
+@@ -26,6 +26,7 @@
+ #include <zlib.h>
+ #include "aes.h"
+ #include <assert.h>
++#include <sys/stat.h>
+
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..85f475d98997
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r1.ebuild,v 1.1 2011/09/21 17:27:43 alexxy Exp $
+
+EAPI="3"
+
+inherit flag-o-matic eutils multilib python
+
+# TPMEMUFILE=tpm_emulator-0.4.tar.gz
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+#	vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
+S="${WORKDIR}/xen-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
+
+CDEPEND="dev-lang/python[ncurses,threads]
+	sys-libs/zlib
+	hvm? ( media-libs/libsdl )
+	acm? ( dev-libs/libxml2 )
+	api? ( dev-libs/libxml2 net-misc/curl )"
+#	vtpm? ( dev-libs/gmp dev-libs/openssl )
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	sys-devel/gcc
+	dev-lang/perl
+	dev-lang/python[ssl]
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+		media-gfx/graphviz
+	)
+	hvm? (
+		x11-proto/xproto
+		sys-devel/dev86
+	)"
+
+RDEPEND="${CDEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	dev-python/pyxml
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( sys-fs/udev sys-apps/hotplug )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
+	usr/share/xen/qemu/openbios-sparc64"
+
+pkg_setup() {
+	export "CONFIG_LOMOUNT=y"
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+#	use vtpm    && export "VTPM_TOOLS=y"
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use acm     && export "ACM_SECURITY=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	#	use vtpm && cp "${DISTDIR}"/${TPMEMUFILE}  tools/vtpm
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		chmod 644 tools/check/check_x11_devel
+		sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
+		sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
+	fi
+
+	if ! use pygrub; then
+		sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
+	fi
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Do not strip binaries
+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+	# fix variable declaration to avoid sandbox issue, #253134
+	epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
+
+	# Fix --as-needed issues, bug 296631
+	epatch "${FILESDIR}/${P}-as-needed.patch" || die "as-needed patch failed to apply"
+
+	# Fix WRITE define, bug #379815
+	epatch "${FILESDIR}/${P}-fix-definitions.patch" \
+		"${FILESDIR}/${P}-fix-include.patch" || die "include patch failed to apply"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake -C tools ${myopt} || die "compile failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		emake docs || die "compiling docs failed"
+		emake dev-docs || die "make dev-docs failed"
+	fi
+
+	emake -C docs man-pages || die "make man-pages failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
+		|| die "install failed"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/etc/sysconfig
+
+	dodoc README docs/README.xen-bugtool docs/ChangeLog
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
+			|| die "install docs failed"
+
+		dohtml -r docs/api/
+		docinto pdf
+		dodoc docs/api/tools/python/latex/refman.pdf
+
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+	rm -rf "${D}"/usr/share/doc/xen/
+
+	doman docs/man?/*
+
+	newinitd "${FILESDIR}"/xend.initd-r1 xend \
+		|| die "Couldn't install xen.initd"
+	newconfd "${FILESDIR}"/xendomains.confd xendomains \
+		|| die "Couldn't install xendomains.confd"
+	newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
+		|| die "Couldn't install xendomains.initd"
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
+		keepdir /var/log/xen-consoles
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
+		echo
+		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
+		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
+		ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+		echo
+		elog "The ioemu use flag has been removed and replaced with hvm."
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+
+	python_mod_optimize $(use pygrub && echo grub) xen
+}
+
+pkg_postrm() {
+	python_mod_cleanup $(use pygrub && echo grub) xen
+}