Bump for #325091
authorPatrick Lauer <patrick@gentoo.org>
Sun, 11 Jul 2010 11:48:30 +0000 (11:48 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Sun, 11 Jul 2010 11:48:30 +0000 (11:48 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

app-emulation/xen-tools/ChangeLog
app-emulation/xen-tools/xen-tools-3.4.3.ebuild [new file with mode: 0644]
app-emulation/xen/ChangeLog
app-emulation/xen/xen-3.4.3.ebuild [new file with mode: 0644]

index 35025d2a95e8df97468f61be331e34bc917cda9b..4b7a0624e1c612e0cd4063f6a322309ddf53ed52 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.63 2010/06/25 16:43:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.64 2010/07/11 11:48:30 patrick Exp $
+
+*xen-tools-3.4.3 (11 Jul 2010)
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.4.3.ebuild:
+  Bump for #325091
 
   25 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
   xen-tools-4.0.0.ebuild, -files/xen-tools-4.0.0-as-needed.patch,
diff --git a/app-emulation/xen-tools/xen-tools-3.4.3.ebuild b/app-emulation/xen-tools/xen-tools-3.4.3.ebuild
new file mode 100644 (file)
index 0000000..92cbe73
--- /dev/null
@@ -0,0 +1,243 @@
+# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/07/11 11:48:30 patrick Exp $
+
+EAPI="2"
+
+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 )"
+
+PYTHON_MODNAME="xen grub"
+
+# 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 gcc 4.4 failure
+       #epatch "${FILESDIR}/${PN}-3.4.1-xc_core-memset.patch"
+
+       # Fix --as-needed issues, bug 296631
+       epatch "${FILESDIR}/${PN}-3.4.2-as-needed.patch"
+}
+
+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
+}
+
+pkg_postrm() {
+       python_mod_cleanup
+}
index 63f1035591187248bd434392bf2fd52ff2f4a9a6..518263bf28eeedcea1dea4249517f540d950b0e7 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.69 2010/06/24 01:40:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.70 2010/07/11 11:48:05 patrick Exp $
+
+*xen-3.4.3 (11 Jul 2010)
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org> +xen-3.4.3.ebuild:
+  Bump for #325091
 
   24 Jun 2010; Christoph Mende <angelos@gentoo.org> xen-3.4.2-r1.ebuild:
   Stable on amd64 wrt bug #293714
diff --git a/app-emulation/xen/xen-3.4.3.ebuild b/app-emulation/xen/xen-3.4.3.ebuild
new file mode 100644 (file)
index 0000000..c62778d
--- /dev/null
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.4.3.ebuild,v 1.1 2010/07/11 11:48:05 patrick Exp $
+
+inherit mount-boot flag-o-matic toolchain-funcs
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug custom-cflags pae acm flask xsm"
+
+RDEPEND="|| ( sys-boot/grub
+               sys-boot/grub-static )
+               >=sys-kernel/xen-sources-2.6.18"
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+       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
+
+       if use xsm ; then
+               export "XSM_ENABLE=y"
+               use acm && export "ACM_SECURITY=y"
+               if use flask ; then
+                       ! use acm  && export "FLASK_ENABLE=y"
+                         use acm  && ewarn "Both acm and flask XSM specified, defaulting to acm."
+               fi
+       elif use acm || use flask ; then
+               ewarn "acm and flask require USE=xsm to be set, dropping use flags"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Fix unexport $target in xen-setup
+       epatch "${FILESDIR}/"${PN}-3.3.0-unexported-target-fix.patch
+
+       # 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
+}
+
+src_compile() {
+       local myopt
+       use debug && myopt="${myopt} debug=y"
+       use pae && myopt="${myopt} pae=y"
+
+       if use custom-cflags; then
+               filter-flags -fPIE -fstack-protector
+               replace-flags -O3 -O2
+       else
+               unset CFLAGS
+       fi
+
+       # Send raw LDFLAGS so that --as-needed works
+       emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
+}
+
+src_install() {
+       local myopt
+       use debug && myopt="${myopt} debug=y"
+       use pae && myopt="${myopt} pae=y"
+
+       emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
+}
+
+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 use pae; then
+               echo
+               ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+       fi
+}