From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S3Pba-0005Iq-TM for garchives@archives.gentoo.org; Fri, 02 Mar 2012 10:20:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C5F5E0762; Fri, 2 Mar 2012 10:20:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E44D7E0762 for ; Fri, 2 Mar 2012 10:20:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E6AE1B402B for ; Fri, 2 Mar 2012 10:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E563DE542A for ; Fri, 2 Mar 2012 10:20:45 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1330683294.20d8cacd15dbcd776ed61bb53b3185890c6c0a13.ian_delaney@gentoo> Subject: [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/ X-VCS-Repository: proj/virtualization X-VCS-Files: app-emulation/xen-tools/Manifest app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild app-emulation/xen-tools/xen-tools-9999.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: ian_delaney X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 20d8cacd15dbcd776ed61bb53b3185890c6c0a13 X-VCS-Branch: master Date: Fri, 2 Mar 2012 10:20:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7f32d3da-d16d-423e-926d-2daac8511afe X-Archives-Hash: 47d5c7940e1171640f6a1942fb712abd commit: 20d8cacd15dbcd776ed61bb53b3185890c6c0a13 Author: Ian Delaney iinet com au> AuthorDate: Fri Mar 2 10:14:54 2012 +0000 Commit: Ian Delaney iinet com au> CommitDate: Fri Mar 2 10:14:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/virtualizatio= n.git;a=3Dcommit;h=3D20d8cacd Added the latest xen-tools version, Manifest (Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commi= t) --- app-emulation/xen-tools/Manifest | 2 + ...tools-9999.ebuild =3D> xen-tools-4.1.2-r2.ebuild} | 50 ++++++++++++= +------- app-emulation/xen-tools/xen-tools-9999.ebuild | 1 - 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/M= anifest index ad78afc..5e67615 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1 +1,3 @@ DIST ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz 2888480 SH= A256 ea2a52a999afab7fefa6300e0f1b38409c170a7503a51d8b572d790e71f2d0f0 SHA= 512 02314727af850bdf51c1963e8da258a65868f3ef116e9833918c770b8737cd1501891= d4dc90d787702a1f34e35198e57373d730b7e2e6671e5fa93ece7c2f073 WHIRLPOOL 9a2= 32852c3dee266dcbd27fae6814497814a0f65123484c37196a99c6cc746a348cf38c77ba0= 84e62e052c64e950b34aa2f152a154e99c0366746f97941b23d7 +DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85b= bcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca3= 6b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a616= 94b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee5= 94167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8= e18054526584d57031 +DIST xen-4.1.2.tar.gz 1084824 SHA256 e0b082fde62e0ca4d7f61eca96c221be92c= 51e1a6161eb4e7eaa4ccfee3420e8 SHA512 670a5dbbfccecd4c100d30c61037acb24e70= 39e5b7f641b1508b1300d056f55ce75a6bf9c062344a2940ebca08197a1956d453acdb175= 4034e2f5280adf41649 WHIRLPOOL 3ac2d6cc5ec35ed9e063e4468b03437e209bbae8f70= dc02deba23fc62fe8d12703e8cde81e0eee2cd51b7b2f1bed9838f75044720baeb6b93f01= 7d09e2edcc50 diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulatio= n/xen-tools/xen-tools-4.1.2-r2.ebuild similarity index 86% copy from app-emulation/xen-tools/xen-tools-9999.ebuild copy to app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild index 8468c3d..3ce8a54 100644 --- a/app-emulation/xen-tools/xen-tools-9999.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-999= 9.ebuild,v 1.7 2011/10/23 10:49:29 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1= .2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $ =20 EAPI=3D"4" PYTHON_DEPEND=3D"2" @@ -9,10 +9,7 @@ PYTHON_USE_WITH=3D"xml threads" if [[ $PV =3D=3D *9999 ]]; then KEYWORDS=3D"" REPO=3D"xen-unstable.hg" - XEN_EXTFILES_URL=3D"http://xenbits.xensource.com/xen-extfiles" - IPXE_COMMIT=3D"9a93db3f0947484e30e753bbd61a10b17336e20e" EHG_REPO_URI=3D"http://xenbits.xensource.com/${REPO}" - SRC_URI=3D"http://dev.gentoo.org/~alexxy/distfiles/ipxe-git-${IPXE_COMM= IT}.tar.gz" S=3D"${WORKDIR}/${REPO}" live_eclass=3D"mercurial" else @@ -125,7 +122,7 @@ pkg_setup() { } =20 src_prepare() { - cp "$DISTDIR/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/i= pxe.tar.gz + cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.= gz sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" =20 # Drop .config @@ -169,19 +166,35 @@ src_prepare() { fi =20 # Fix build for gcc-4.6 - local WERROR=3D( - "tools/libxl/Makefile" - "tools/xenstat/xentop/Makefile" - ) - for mf in ${WERROR[@]} ; do - sed -e "s:-Werror::g" -i $mf || die - done + sed -e "s:-Werror::g" -i tools/xenstat/xentop/Makefile || die + + # 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" =20 # Prevent the downloading of ipxe sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \ -e 's:^\tfi:#\tfi:' -i \ -e 's:^\tmv _$T $T:#\tmv _$T $T:' \ -i tools/firmware/etherboot/Makefile || die + + # Fix bridge by idella4, bug #362575 + epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" + + # Remove check_curl, new fix to Bug #386487 + epatch "${FILESDIR}/${PN}-4.1.1-curl.patch" + sed -i -e 's|has_or_fail curl-config|has_or_fail curl-config\nset -ux|'= \ + tools/check/check_curl || die + + # Don't build ipxe with pie on hardened, Bug #360805 + if gcc-specs-pie; then + epatch "${FILESDIR}/ipxe-nopie.patch" + fi + + # Fix create.py for pyxml Bug 367735 + epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch" } =20 src_compile() { @@ -211,7 +224,7 @@ src_install() { export INITD_DIR=3D/etc/init.d export CONFIG_LEAF_DIR=3Ddefault =20 - emake DESTDIR=3D"${D}" DOCDIR=3D"/usr/share/doc/${PF}" XEN_PYTHON_NATIV= E_INSTALL=3Dy install-tools + emake DESTDIR=3D"${ED}" DOCDIR=3D"/usr/share/doc/${PF}" XEN_PYTHON_NATI= VE_INSTALL=3Dy install-tools python_convert_shebangs -r 2 "${ED}" =20 # Remove RedHat-specific stuff @@ -223,26 +236,28 @@ src_install() { -e 's:^#vifscript=3D"vif-bridge":vifscript=3D"vif-bridge":' \ -i tools/examples/xl.conf || die =20 +# dodoc README docs/README.xen-bugtool docs/ChangeLog if use doc; then emake DESTDIR=3D"${ED}" DOCDIR=3D"/usr/share/doc/${PF}" install-docs =20 dohtml -r docs/api/ docinto pdf dodoc ${DOCS[@]} + #docs/api/tools/python/latex/refman.pdf [ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${= ED}"/usr/share/doc/${PF}/html fi rm -rf "${ED}"/usr/share/doc/xen/ doman docs/man?/* =20 if use xend; then - newinitd "${FILESDIR}"/xend.initd-r2 xend + 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 newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored \ - "${FILESDIR}"/xenconsoled.initd xenconsoled + newinitd "${FILESDIR}"/xenstored.initd xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled =20 if use screen; then cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendom= ains || die @@ -307,4 +322,3 @@ pkg_postinst() { pkg_postrm() { python_mod_cleanup $(use pygrub && echo grub) xen } - diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulatio= n/xen-tools/xen-tools-9999.ebuild index 8468c3d..452628a 100644 --- a/app-emulation/xen-tools/xen-tools-9999.ebuild +++ b/app-emulation/xen-tools/xen-tools-9999.ebuild @@ -307,4 +307,3 @@ pkg_postinst() { pkg_postrm() { python_mod_cleanup $(use pygrub && echo grub) xen } -