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 1S3SDh-0004WJ-Vw for garchives@archives.gentoo.org; Fri, 02 Mar 2012 13:08:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80AE6E09D6; Fri, 2 Mar 2012 13:08:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 42F39E09D6 for ; Fri, 2 Mar 2012 13:08:18 +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 81D3B1B402B for ; Fri, 2 Mar 2012 13:08:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3B92EE542A for ; Fri, 2 Mar 2012 13:08:16 +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: <1330693362.ada5dba6934ec09a766353446ca0830d6016ed5d.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-r3.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: ian_delaney X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: ada5dba6934ec09a766353446ca0830d6016ed5d X-VCS-Branch: master Date: Fri, 2 Mar 2012 13:08:16 +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: 30d76eff-68b0-426c-946c-9c6307079db3 X-Archives-Hash: 117d4ee308fc54db02f853bee8495f60 commit: ada5dba6934ec09a766353446ca0830d6016ed5d Author: Ian Delaney iinet com au> AuthorDate: Fri Mar 2 13:02:42 2012 +0000 Commit: Ian Delaney iinet com au> CommitDate: Fri Mar 2 13:02:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/virtualizatio= n.git;a=3Dcommit;h=3Dada5dba6 Adding xen-tools-4.1.2-r3.ebuild, fix static-libs (Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commi= t) --- app-emulation/xen-tools/Manifest | 2 +- app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild | 329 +++++++++++++++= ++++++ 2 files changed, 330 insertions(+), 1 deletions(-) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/M= anifest index 5e67615..d4f52aa 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,3 +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 +DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84f= a3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b43= 65033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766f= f79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228c= bc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109= f702800fe5566 diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild b/app-emul= ation/xen-tools/xen-tools-4.1.2-r3.ebuild new file mode 100644 index 0000000..4d22347 --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild @@ -0,0 +1,329 @@ +# 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-4.1= .2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $ + +EAPI=3D"4" +PYTHON_DEPEND=3D"2" +PYTHON_USE_WITH=3D"xml threads" + +if [[ $PV =3D=3D *9999 ]]; then + KEYWORDS=3D"" + REPO=3D"xen-unstable.hg" + EHG_REPO_URI=3D"http://xenbits.xensource.com/${REPO}" + S=3D"${WORKDIR}/${REPO}" + live_eclass=3D"mercurial" +else + KEYWORDS=3D"~amd64 ~x86" + XEN_EXTFILES_URL=3D"http://xenbits.xensource.com/xen-extfiles" + SRC_URI=3D"http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.ta= r.gz \ + $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz" + S=3D"${WORKDIR}/xen-${PV}" +fi + +inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclas= s} + +DESCRIPTION=3D"Xend daemon and tools" +HOMEPAGE=3D"http://xen.org/" +DOCS=3D( README docs/README.xen-bugtool docs/ChangeLog ) + +LICENSE=3D"GPL-2" +SLOT=3D"0" +IUSE=3D"api custom-cflags debug doc flask hvm qemu pygrub screen static-= libs xend" + +REQUIRED_USE=3D"hvm? ( qemu )" + +QA_PRESTRIPPED=3D"/usr/share/xen/qemu/openbios-ppc \ + /usr/share/xen/qemu/openbios-sparc64 \ + /usr/share/xen/qemu/openbios-sparc32" +QA_WX_LOAD=3D${QA_PRESTRIPPED} + +CDEPEND=3D"=3Ddev-lang/ocaml-3.12.0 + 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=3D"usr/lib/xen/boot/hvmloader" +QA_EXECSTACK=3D"usr/share/xen/qemu/openbios-sparc32 + usr/share/xen/qemu/openbios-sparc64" +RESTRICT=3D"test" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + export "CONFIG_LOMOUNT=3Dy" + + if use qemu; then + export "CONFIG_IOEMU=3Dy" + else + export "CONFIG_IOEMU=3Dn" + fi + + 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=3Dhvm 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=3D"x86_32" + elif use amd64 ; then + export XEN_TARGET_ARCH=3D"x86_64" + else + die "Unsupported architecture!" + fi + fi + + use api && export "LIBXENAPI_BINDINGS=3Dy" + use flask && export "FLASK_ENABLE=3Dy" +} + +src_prepare() { + 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" + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't= drop" + # Xend + if ! use xend; then + sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-p= ath:' \ + -i tools/misc/Makefile || die "Disabling xend failed" || die + sed -e 's:^XEND_INITD:#XEND_INITD:' \ + -i tools/examples/Makefile || "Disabling xend failed" || die + 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" + + # try and remove all the default custom-cflags + find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec s= ed \ + -e 's/CFLAGS\(.*\)=3D\(.*\)-O3\(.*\)/CFLAGS\1=3D\2\3/' \ + -e 's/CFLAGS\(.*\)=3D\(.*\)-march=3Di686\(.*\)/CFLAGS\1=3D\2\3/' \ + -e 's/CFLAGS\(.*\)=3D\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=3D\2\3/= ' \ + -e 's/CFLAGS\(.*\)=3D\(.*\)-g3*\s\(.*\)/CFLAGS\1=3D\2 \3/' \ + -e 's/CFLAGS\(.*\)=3D\(.*\)-O2\(.*\)/CFLAGS\1=3D\2\3/' \ + -i {} \; || die "failed to re-set custom-cflags" + fi + + if ! use pygrub; then + sed -e '/^SUBDIRS-$(PYTHON_TOOLS) +=3D pygrub$/d' -i tools/Makefile ||= die + 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 -e '/^CONFIG_IOEMU :=3D y$/d' -i config/*.mk || die + sed -e '/SUBDIRS-$(CONFIG_X86) +=3D firmware/d' -i tools/Makefile || d= ie + fi + + # Don't bother with qemu, only needed for fully virtualised guests + if ! use qemu; then + sed -e "/^CONFIG_IOEMU :=3D y$/d" -i config/*.mk || die + sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makef= ile || die + fi + + # Fix build for gcc-4.6 + 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" + + # 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" +} + +src_compile() { + export VARTEXFONTS=3D"${T}/fonts" + local myopt + use debug && myopt=3D"${myopt} debug=3Dy" + + use custom-cflags || unset CFLAGS + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + unset LDFLAGS + emake CC=3D$(tc-getCC) LD=3D$(tc-getLD) -C tools ${myopt} + + if use doc; then + sh ./docs/check_pkgs || die "package check failed" + emake docs + emake dev-docs + fi + + emake -C docs man-pages +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=3D/etc/init.d + export CONFIG_LEAF_DIR=3Ddefault + + emake DESTDIR=3D"${ED}" DOCDIR=3D"/usr/share/doc/${PF}" XEN_PYTHON_NATI= VE_INSTALL=3Dy install-tools + python_convert_shebangs -r 2 "${ED}" + + # Remove RedHat-specific stuff + rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || die + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=3D1:autoballoon=3D1:' \ + -e 's:^#lockfile=3D"/var/lock/xl":lockfile=3D"/var/lock/xl":' \ + -e 's:^#vifscript=3D"vif-bridge":vifscript=3D"vif-bridge":' \ + -i tools/examples/xl.conf || die + +# dodoc README docs/README.xen-bugtool docs/ChangeLog + if use doc; then + emake DESTDIR=3D"${ED}" DOCDIR=3D"/usr/share/doc/${PF}" install-docs + + 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?/* + + 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 + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendom= ains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die + keepdir /var/log/xen-consoles + fi + + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f ${ED}usr/$(get_libdir)/*.a ${ED}usr/$(get_libdir)/ocaml/*/*.a + fi + + python_convert_shebangs -r 2 "${ED}" + # xend expects these to exist + keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xe= n /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://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" + + if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then + echo + ewarn "xend may not work when python is built with stack smashing prot= ection (ssp)." + ewarn "If 'xm create' fails with '', 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=3Dncurses." + ewarn "Please rebuild python with USE=3Dncurses 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=3Dminimal. Networking" + ewarn "will not work until you rebuild iproute2 without USE=3Dminimal.= " + 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 qemu use flag has been removed and replaced with hvm." + fi + + if use xend; then + echo + elog "xend capability has been enabled and installed" + fi + + if grep -qsF XENSV=3D "${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 ne= eded." + fi + python_mod_optimize $(use pygrub && echo grub) xen +} + +pkg_postrm() { + python_mod_cleanup $(use pygrub && echo grub) xen +}