From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B9AC313838B for ; Fri, 12 Sep 2014 02:21:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E038CE0936; Fri, 12 Sep 2014 02:21:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3ADBBE0936 for ; Fri, 12 Sep 2014 02:21:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15A2734022B for ; Fri, 12 Sep 2014 02:21:30 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2354) id 6D3B1541F; Fri, 12 Sep 2014 02:21:28 +0000 (UTC) From: "Yixun Lan (dlan)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dlan@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools: xen-tools-4.2.5.ebuild ChangeLog xen-tools-4.4.1.ebuild xen-tools-4.3.3.ebuild xen-tools-4.4.0-r9.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: xen-tools-4.2.5.ebuild ChangeLog xen-tools-4.4.1.ebuild xen-tools-4.3.3.ebuild xen-tools-4.4.0-r9.ebuild X-VCS-Directories: app-emulation/xen-tools X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140912022128.6D3B1541F@oystercatcher.gentoo.org> Date: Fri, 12 Sep 2014 02:21:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3106c96d-8f80-425c-9d4d-0c31cd495a56 X-Archives-Hash: 71fc92b182c80fd0d1f2e4014d1678c7 dlan 14/09/12 02:21:28 Modified: xen-tools-4.2.5.ebuild ChangeLog xen-tools-4.4.1.ebuild xen-tools-4.3.3.ebuild Removed: xen-tools-4.4.0-r9.ebuild Log: shrink patches, move to devspace; drop USE=xend for 4.2.5 4.3.3 (Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55) Revision Changes Path 1.2 app-emulation/xen-tools/xen-tools-4.2.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild?r1=1.1&r2=1.2 Index: xen-tools-4.2.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-tools-4.2.5.ebuild 11 Sep 2014 05:33:16 -0000 1.1 +++ xen-tools-4.2.5.ebuild 12 Sep 2014 02:21:28 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.5.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $ EAPI=5 @@ -16,13 +16,16 @@ else KEYWORDS="~amd64 ~x86" UPSTREAM_VER= - GENTOO_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=0 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 SEABIOS_VER=1.6.3.2 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz @@ -40,7 +43,7 @@ LICENSE="GPL-2" SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios" +IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios" REQUIRED_USE="hvm? ( qemu ) ${PYTHON_REQUIRED_USE}" @@ -136,21 +139,20 @@ fi # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + source "${FILESDIR}"/gentoo-patches.conf + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-gentoo/$i + done fi - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch + use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" + if gcc-specs-pie; then + epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch fi # if the user *really* wants to use their own custom-cflags, let them @@ -189,54 +191,6 @@ sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die fi - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - epatch "${FILESDIR}"/${PN}-4.2-pod-utf8-chars.patch \ - "${FILESDIR}"/${PN}-4.2-pod-docs.patch \ - "${FILESDIR}"/${PN}-4.2-pod-xl.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Don't build ipxe with pie on hardened, Bug #360805 - if gcc-specs-pie; then - epatch "${FILESDIR}"/ipxe-nopie.patch - fi - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch - - # add missing header, Bug #467200 - 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 - - # Bug 463840 - epatch "${FILESDIR}"/${PN}-4.2.2-install.patch - epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Bug 510976 - epatch "${FILESDIR}"/${PN}-4.2.4-udev-rules.patch - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die @@ -323,9 +277,6 @@ rm -rf "${D}"/usr/share/doc/xen/ doman docs/man?/* - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi newconfd "${FILESDIR}"/xendomains.confd xendomains newconfd "${FILESDIR}"/xenstored.confd xenstored newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled @@ -375,13 +326,6 @@ elog "Recommended to utilise the xencommons script to config sytem at boot." elog "Add by use of rc-update on completion of the install" - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - # TODO: we need to have the current Python slot here. if ! has_version "dev-lang/python[ncurses]"; then echo @@ -402,11 +346,6 @@ elog "An x86 or amd64 system is required to build HVM support." fi - if use xend; then - echo - elog "xend capability has been enabled and installed" - fi - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then echo elog "xensv is broken upstream (Gentoo bug #142011)." 1.257 app-emulation/xen-tools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.257&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.257&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?r1=1.256&r2=1.257 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- ChangeLog 11 Sep 2014 05:33:16 -0000 1.256 +++ ChangeLog 12 Sep 2014 02:21:28 -0000 1.257 @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.256 2014/09/11 05:33:16 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.257 2014/09/12 02:21:28 dlan Exp $ + + 12 Sep 2014; Yixun Lan xen-tools-4.2.5.ebuild, + xen-tools-4.3.3.ebuild, -xen-tools-4.4.0-r9.ebuild, xen-tools-4.4.1.ebuild, + +files/gentoo-patches.conf: + shrink patches, move to devspace; drop USE=xend for 4.2.5 4.3.3 *xen-tools-4.4.1 (11 Sep 2014) *xen-tools-4.3.3 (11 Sep 2014) 1.2 app-emulation/xen-tools/xen-tools-4.4.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild?r1=1.1&r2=1.2 Index: xen-tools-4.4.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-tools-4.4.1.ebuild 11 Sep 2014 05:33:16 -0000 1.1 +++ xen-tools-4.4.1.ebuild 12 Sep 2014 02:21:28 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.4.1.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $ EAPI=5 @@ -18,13 +18,16 @@ else KEYWORDS="~amd64 ~arm -x86" UPSTREAM_VER= - GENTOO_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=0 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 SEABIOS_VER=1.7.3.1 [[ -n ${UPSTREAM_VER} ]] && \ UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz @@ -149,47 +152,18 @@ fi # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + source "${FILESDIR}"/gentoo-patches.conf + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-gentoo/$i + done fi - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.4-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - - # Bug 477676 - epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/xen-4.4-qemu-bridge.patch mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch - - # Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302 - epatch "${FILESDIR}"/${PN}-4-qemu-fix-po-collision.patch - - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die @@ -399,13 +373,6 @@ elog "Recommended to utilise the xencommons script to config sytem At boot" elog "Add by use of rc-update on completion of the install" - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - # TODO: we need to have the current Python slot here. if ! has_version "dev-lang/python[ncurses]"; then echo 1.2 app-emulation/xen-tools/xen-tools-4.3.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild?r1=1.1&r2=1.2 Index: xen-tools-4.3.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-tools-4.3.3.ebuild 11 Sep 2014 05:33:16 -0000 1.1 +++ xen-tools-4.3.3.ebuild 12 Sep 2014 02:21:28 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.3.3.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $ EAPI=5 @@ -16,13 +16,16 @@ else KEYWORDS="~amd64 -x86" UPSTREAM_VER= - GENTOO_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=0 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 SEABIOS_VER=1.7.1-stable-xen [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz @@ -43,7 +46,7 @@ # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make # >=dev-lang/ocaml-4 stable # Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend system-seabios" +IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios" REQUIRED_USE="hvm? ( qemu ) ${PYTHON_REQUIRED_USE} @@ -138,66 +141,27 @@ fi # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + source "${FILESDIR}"/gentoo-patches.conf + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-gentoo/$i + done fi - # Drop .config, fixes to gcc-4.6 - epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch - - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch \ - "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - # Bug 496708 - epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch - use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch - - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch - - # add missing header - epatch "${FILESDIR}"/xen-4-ulong.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch + use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - # Bug 477676 - epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch - - # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge.patch + # Bug 478064 mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - # bundled seabios - epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null - # Xend - if ! use xend; then - sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ - -i tools/misc/Makefile || die "Disabling xend failed" - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || die "Disabling xend failed" - fi - # 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" @@ -344,9 +308,6 @@ rm -rf "${D}"/usr/share/doc/xen/ doman docs/man?/* - if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" - fi newconfd "${FILESDIR}"/xendomains.confd xendomains newconfd "${FILESDIR}"/xenstored.confd xenstored newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled @@ -399,13 +360,6 @@ elog "Recommended to utilise the xencommons script to config sytem At boot" elog "Add by use of rc-update on completion of the install" - if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - # TODO: we need to have the current Python slot here. if ! has_version "dev-lang/python[ncurses]"; then echo @@ -426,10 +380,6 @@ elog "An x86 or amd64 system is required to build HVM support." fi - if use xend; then - elog"";elog "xend capability has been enabled and installed" - fi - if use qemu; then elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"