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 41DB21387B1 for ; Mon, 20 Jan 2014 10:27:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 954AEE0C3A; Mon, 20 Jan 2014 10:27:08 +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 D87E3E0DC2 for ; Mon, 20 Jan 2014 10:27:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA77833BF13 for ; Mon, 20 Jan 2014 10:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A87E318730 for ; Mon, 20 Jan 2014 10:27:04 +0000 (UTC) From: "Lan Yixun" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lan Yixun" Message-ID: <1390191913.2bed79aaa0cce59e4e9b4da6d6c6ccb7c4e16658.dlan@gentoo> Subject: [gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/files/, app-emulation/xen-tools/ X-VCS-Repository: proj/virtualization X-VCS-Files: app-emulation/xen-tools/Manifest app-emulation/xen-tools/files/qemu-bridge-r1.patch app-emulation/xen-tools/files/xen-4.2.0-nostrip-r1.patch app-emulation/xen-tools/metadata.xml app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild X-VCS-Directories: app-emulation/xen-tools/files/ app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Lan Yixun X-VCS-Revision: 2bed79aaa0cce59e4e9b4da6d6c6ccb7c4e16658 X-VCS-Branch: dlan Date: Mon, 20 Jan 2014 10:27:04 +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: d2decf4d-f486-4bd5-9570-654097942540 X-Archives-Hash: 7ffacbddd32c096c825ec1b61ee517e2 commit: 2bed79aaa0cce59e4e9b4da6d6c6ccb7c4e16658 Author: Yixun Lan gentoo org> AuthorDate: Thu Jan 16 09:03:31 2014 +0000 Commit: Lan Yixun gentoo org> CommitDate: Mon Jan 20 04:25:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=2bed79aa app-emulation/xen-tools: update to 4.4.0-rc2 Signed-off-by: Yixun Lan gentoo.org> --- app-emulation/xen-tools/Manifest | 3 + app-emulation/xen-tools/files/qemu-bridge-r1.patch | 79 ++++ .../xen-tools/files/xen-4.2.0-nostrip-r1.patch | 13 + app-emulation/xen-tools/metadata.xml | 1 + app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild | 411 +++++++++++++++++++++ 5 files changed, 507 insertions(+) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 53e7e61..b81c9d4 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,3 +1,6 @@ DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d +DIST seabios-dir-remote-20130802.tar.gz 463822 SHA256 b70ba80ba7f6cddd935cb7afe035fc48e0ee393f4d2e080f953326c4721c4bdf SHA512 5278eefbd09f111469d32528acb7ce078b64009cca9e749203eee8695add4dab052fef16f8452a43f62c97b53aeb7227bc083a09167802add96c26203055f5e7 WHIRLPOOL 3346bded3d94047e584fa20d56cfe4d42a97c3c8f7353a71ea6800b3539bbb07b4e833ab8e4b98abc0e621eb9f5f6062f4658066eb4c3e4752e5489253a2cead DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca +DIST xen-4.4.0-rc1.tar.gz 18099051 SHA256 677f2f162a92da9758cfdcd630c5774b4e2ab27bd641f140f630195ba307c6b5 SHA512 0dd81952d27f7d56a11645c365cf0b1eb8892ad526bf7dd92676f0788721b7c574117c4bfc0115282ee8d40241c8cc04b7852ce74f3f8f05130866ba3e6cb77c WHIRLPOOL 4a9131d5a1dfc89d98bd093868b17fef399c3ff74a64400b8e0faa32e0ca589d12d1af999d37a2161a18c54352aa2bf2b4fce5bfd38aa8d39db12a15e157b1c8 +DIST xen-4.4.0-rc2.tar.gz 18102834 SHA256 2ab42564fb3e06878416b0db31b751f95efa1bfdf01e538af53b8e2f9ae03ca8 SHA512 542ee46a7a1956a9443c6c912f46558315050c73ef59d70f8bd7a8259c380fa5baf4aaeeeae2b0538144829d67ff43057b2427f3529c167cf217404452362989 WHIRLPOOL 54e1613cfaf5844e80a23f461b1e74febd73a3116ccf7d831d2fdc8c51df6e0604ae8a47d9668b4db6c1a1ce9626adb3cb283a798c87e5711dffa8ed1942b98b diff --git a/app-emulation/xen-tools/files/qemu-bridge-r1.patch b/app-emulation/xen-tools/files/qemu-bridge-r1.patch new file mode 100644 index 0000000..8544561 --- /dev/null +++ b/app-emulation/xen-tools/files/qemu-bridge-r1.patch @@ -0,0 +1,79 @@ +diff --git a/tools/qemu-xen/Makefile b/tools/qemu-xen/Makefile +index 4d257f1..db2c2ad 100644 +--- a/tools/qemu-xen/Makefile ++++ b/tools/qemu-xen/Makefile +@@ -62,7 +62,7 @@ $(call set-vpath, $(SRC_PATH)) + + LIBS+=-lz $(LIBS_TOOLS) + +-HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ++HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF) + + ifdef BUILD_DOCS + DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt +@@ -186,7 +186,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a + qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a + qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a + +-qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o ++xen-bridge-helper$(EXESUF): xen-bridge-helper.o + + fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a + fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap +diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h +index 30e4b04..6691ff0 100644 +--- a/tools/qemu-xen/include/net/net.h ++++ b/tools/qemu-xen/include/net/net.h +@@ -178,7 +178,7 @@ NetClientState *net_hub_port_find(int hub_id); + + #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" + #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" +-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" ++#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" + #define DEFAULT_BRIDGE_INTERFACE "br0" + + void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); +diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c +index 6a0974e..74b4635 100644 +--- a/tools/qemu-xen/qemu-bridge-helper.c ++++ b/tools/qemu-xen/qemu-bridge-helper.c +@@ -67,7 +67,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; + static void usage(void) + { + fprintf(stderr, +- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); ++ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); + } + + static int parse_acl_file(const char *filename, ACLList *acl_list) +diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx +index d15338e..f7104f1 100644 +--- a/tools/qemu-xen/qemu-options.hx ++++ b/tools/qemu-xen/qemu-options.hx +@@ -1601,7 +1601,7 @@ to disable script execution. + + If running QEMU as an unprivileged user, use the network helper + @var{helper} to configure the TAP interface. The default network +-helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. ++helper executable is @file{/usr/local/libexec/xen-bridge-helper}. + + @option{fd}=@var{h} can be used to specify the handle of an already + opened host TAP interface. +@@ -1625,7 +1625,7 @@ qemu-system-i386 linux.img \ + #launch a QEMU instance with the default network helper to + #connect a TAP device to bridge br0 + qemu-system-i386 linux.img \ +- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper" ++ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper" + @end example + + @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] +@@ -1634,7 +1634,7 @@ Connect a host TAP network interface to a host bridge device. + + Use the network helper @var{helper} to configure the TAP interface and + attach it to the bridge. The default network helper executable is +-@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge ++@file{/usr/local/libexec/xen-bridge-helper} and the default bridge + device is @file{br0}. + + Examples: diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip-r1.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip-r1.patch new file mode 100644 index 0000000..7ddd354 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip-r1.patch @@ -0,0 +1,13 @@ +diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target +--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 ++++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 +@@ -437,9 +437,6 @@ + install: all + ifneq ($(PROGS),) + $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" +-ifneq ($(STRIP),) +- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) +-endif + endif + ifdef CONFIG_TRACE_SYSTEMTAP + ifdef CONFIG_TRACE_SYSTEMTAP diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index d4b0bc5..31f4246 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -16,5 +16,6 @@ Enable support the xend and xm to manage xen Enable support for the ocaml language Enable pam support + Enable Xen security framework support diff --git a/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild new file mode 100644 index 0000000..c04d296 --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild @@ -0,0 +1,411 @@ +# Copyright 1999-2013 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.1-r3.ebuild,v 1.4 2013/12/22 12:01:08 idella4 Exp $ + +EAPI=5 + +MY_PV=${PV/_/-} + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE='xml,threads' + +IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" +XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130802.tar.gz" + +if [[ $PV == *9999 ]]; then + KEYWORDS="" + REPO="xen-unstable.hg" + EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" + S="${WORKDIR}/${REPO}" + live_eclass="mercurial" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${MY_PV}.tar.gz + $IPXE_TARBALL_URL + $XEN_SEABIOS_URL" + S="${WORKDIR}/xen-${MY_PV}" +fi + +inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} + +DESCRIPTION="Xend daemon and tools" +HOMEPAGE="http://xen.org/" +DOCS=( README docs/README.xen-bugtool ) + +LICENSE="GPL-2" +SLOT="0" +# 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 xsm flask hvm qemu ocaml +pam python pygrub screen static-libs xend" + +REQUIRED_USE="hvm? ( qemu ) + ${PYTHON_REQUIRED_USE} + pygrub? ( python )" + +DEPEND="dev-libs/lzo:2 + dev-libs/yajl + dev-libs/libgcrypt + dev-python/lxml[${PYTHON_USEDEP}] + pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) + sys-libs/zlib + sys-power/iasl + hvm? ( media-libs/libsdl ) + ${PYTHON_DEPS} + api? ( dev-libs/libxml2 + net-misc/curl ) + pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) + sys-devel/bin86 + sys-devel/dev86 + dev-lang/perl + app-misc/pax-utils + dev-python/markdown + doc? ( + app-doc/doxygen + dev-tex/latex2html[png,gif] + media-gfx/graphviz + dev-tex/xcolor + media-gfx/transfig + dev-texlive/texlive-latexextra + virtual/latex-base + dev-tex/latexmk + dev-texlive/texlive-latex + dev-texlive/texlive-pictures + dev-texlive/texlive-latexrecommended + ) + hvm? ( x11-proto/xproto + !net-libs/libiscsi ) + qemu? ( x11-libs/pixman ) + ocaml? ( dev-ml/findlib + >=dev-lang/ocaml-4 )" +RDEPEND="sys-apps/iproute2 + net-misc/bridge-utils + screen? ( + app-misc/screen + app-admin/logrotate + ) + virtual/udev" + +# hvmloader is used to bootstrap a fully virtualized kernel +# Approved by QA team in bug #144032 +QA_WX_LOAD="usr/lib/xen/boot/hvmloader" + +RESTRICT="test" + +pkg_setup() { + python-single-r1_pkg_setup + export "CONFIG_LOMOUNT=y" + + if has_version dev-libs/libgcrypt; then + export "CONFIG_GCRYPT=y" + fi + if use xsm; then + export "XSM_ENABLE=y" + if use flask; then + export "FLASK_ENABLE=y" + fi + else + export "XSM_ENABLE=n" + fi + + if use qemu; then + export "CONFIG_IOEMU=y" + else + export "CONFIG_IOEMU=n" + fi + + if use xend; then + export "CONFIG_XEND=y" + else + export "CONFIG_XEND=n" + 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=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 +} + +src_prepare() { + # Drop .config, fixes to gcc-4.6 + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + # 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 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 {} + || die "failed to re-set custom-cflags" + fi + + if ! use pygrub; then + sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die + fi + + if ! use python; then + sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die + fi + + # Disable hvm support on systems that don't support x86_32 binaries. + if ! use hvm; then + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die + fi + + # Don't bother with qemu, only needed for fully virtualised guests + sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die + + # Fix texi2html build error with new texi2html, qemu.doc.html + epatch "${FILESDIR}"/${PN}-4-docfix.patch + + # Fix network broadcast on bridged networks + epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" + + # Prevent the downloading of ipxe, seabios + epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch + cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die + mv ../seabios-dir-remote tools/firmware/ || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null + + # 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-r1.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 472438 + sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ + -i Config.mk || die + + # Bug 477676 + epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch + + # Prevent file collision with qemu package Bug 478064 + epatch "${FILESDIR}"/qemu-bridge-r1.patch + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + + use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ + -i tools/firmware/Makefile || die + + # Bug 379537 + epatch "${FILESDIR}"/fix-gold-ld.patch + + # xencommons, Bug #492332, sed lighter weight than patching + sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ + -i tools/hotplug/Linux/init.d/xencommons || die + + # respect multilib, usr/lib/libcacard.so.0.0.0 + sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ + -i tools/qemu-xen/configure || die + + epatch_user +} + +src_configure() { + local myconf="--prefix=/usr --libdir=/usr/$(get_libdir) --disable-werror" + + if use ocaml + then + myconf="${myconf} $(use_enable ocaml ocamltools)" + else + myconf="${myconf} --disable-ocamltools" + fi + + if ! use pam + then + myconf="${myconf} --disable-pam" + fi + + econf ${myconf} +} + +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 + + unset LDFLAGS + unset CFLAGS + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} + + use doc && emake -C docs txt html + emake -C docs man-pages +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=/tmp/init.d + export CONFIG_LEAF_DIR=../tmp/default + + # Let the build system compile installed Python modules. + local PYTHONDONTWRITEBYTECODE + export PYTHONDONTWRITEBYTECODE + + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ + XEN_PYTHON_NATIVE_INSTALL=y install-tools + + # Fix the remaining Python shebangs. + python_fix_shebang "${D}" + + # Remove RedHat-specific stuff + rm -rf "${D}"tmp || die + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=1:autoballoon=1:' \ + -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ + -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ + -i tools/examples/xl.conf || die + + # Reset bash completion dir; Bug 472438 + mv "${D}"bash-completion "${D}"usr/share/ || die + + if use doc; then + emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs + + dohtml -r docs/ + docinto pdf + dodoc ${DOCS[@]} + [ -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?/* + + 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 + newinitd "${FILESDIR}"/xencommons.initd xencommons + newconfd "${FILESDIR}"/xencommons.confd xencommons + newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev + newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die + keepdir /var/log/xen-consoles + fi + + # Move files built with use qemu, Bug #477884 + if [[ "${ARCH}" == 'amd64' ]]; then + mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die + mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die + fi + + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a + fi + + # xend expects these to exist + keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen + + # for xendomains + keepdir /etc/xen/auto + + # Temp QA workaround + dodir "$(udev_get_udevdir)" + mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" + rm -rf "${D}"/etc/udev + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ + -o -name openbios-ppc -o -name palcode-clipper \) -delete || die +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "https://wiki.gentoo.org/wiki/Xen" + elog "http://wiki.xen.org/wiki/Main_Page" + elog "" + 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 + 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." + 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" + elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" + elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" + 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 +}