From a8b336f9d61a3691f2cf4f71080a386e4a0aa99e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Tue, 21 Feb 2012 08:04:00 +0000 Subject: Add qemu-user patches in (Portage version: 2.2.0_alpha88/cvs/Linux x86_64) --- app-emulation/qemu/ChangeLog | 7 +- app-emulation/qemu/qemu-1.0-r3.ebuild | 257 ++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 app-emulation/qemu/qemu-1.0-r3.ebuild (limited to 'app-emulation/qemu') diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index 3fb3c2db0bad..67503ada3783 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.102 2012/01/29 12:18:34 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.103 2012/02/21 08:04:00 lu_zero Exp $ + +*qemu-1.0-r3 (21 Feb 2012) + + 21 Feb 2012; Luca Barbato +qemu-1.0-r3.ebuild: + Add qemu-user patches in 29 Jan 2012; Sergei Trofimovich qemu-1.0-r2.ebuild, qemu-9999.ebuild: diff --git a/app-emulation/qemu/qemu-1.0-r3.ebuild b/app-emulation/qemu/qemu-1.0-r3.ebuild new file mode 100644 index 000000000000..b897373f845e --- /dev/null +++ b/app-emulation/qemu/qemu-1.0-r3.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r3.ebuild,v 1.1 2012/02/21 08:04:00 lu_zero Exp $ + +EAPI=4 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="git://git.qemu.org/qemu.git + http://git.qemu.org/git/qemu.git" + GIT_ECLASS="git-2" +fi + +inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs + +if [[ ${PV} != *9999* ]]; then + SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz + http://dev.gentoo.org/~lu_zero/distfiles/${P}-patches.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU emulator and ABI wrapper" +HOMEPAGE="http://www.qemu.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss +opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde ++vhost-net xattr xen" + +COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" +IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} +qemu_softmmu_targets_${target}" +done + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} +qemu_user_targets_${target}" + RDEPEND="${RDEPEND} + !app-emulation/qemu-user[qemu_user_targets_${target}?]" +done + +RESTRICT="test" + +RDEPEND="${RDEPEND} + !app-emulation/qemu-kvm + >=dev-libs/glib-2.0 + sys-apps/pciutils + >=sys-apps/util-linux-2.16.0 + sys-libs/zlib + aio? ( dev-libs/libaio ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + brltty? ( app-accessibility/brltty ) + curl? ( net-misc/curl ) + esd? ( media-sound/esound ) + fdt? ( >=sys-apps/dtc-1.2.0 ) + jpeg? ( virtual/jpeg ) + ncurses? ( sys-libs/ncurses ) + nss? ( dev-libs/nss ) + opengl? ( + virtual/opengl + x11-libs/libX11 + ) + png? ( media-libs/libpng ) + pulseaudio? ( media-sound/pulseaudio ) + qemu-ifup? ( + sys-apps/iproute2 + net-misc/bridge-utils + ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + sdl? ( >=media-libs/libsdl-1.2.11[X] ) + spice? ( + >=app-emulation/spice-0.9.0 + >=app-emulation/spice-protocol-0.8.1 + ) + ssl? ( net-libs/gnutls ) + usbredir? ( sys-apps/usbredir ) + vde? ( net-misc/vde ) + xattr? ( sys-apps/attr ) + xen? ( app-emulation/xen-tools ) +" + +DEPEND="${RDEPEND} + app-text/texi2html + dev-util/pkgconfig + >=sys-kernel/linux-headers-2.6.35 +" + +# alpha ELF binary. don't let portage mess with it +STRIP_MASK="usr/share/qemu/palcode-clipper" + +QA_PRESTRIPPED=" + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/palcode-clipper +" +# keep sorted +QA_WX_LOAD="${QA_PRESTRIPPED} + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-armeb + usr/bin/qemu-cris + usr/bin/qemu-i386 + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc32plus + usr/bin/qemu-sparc64 + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 + usr/bin/qemu-x86_64 +" + +pkg_setup() { + use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" +} + +src_prepare() { + # bug #400595 / CVE-2012-0029 + epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch + + EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target || die + # append CFLAGS while linking + sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die + + # Fix underlinking. + # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS= + sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die +} + +src_configure() { + local conf_opts audio_opts user_targets + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + use "qemu_softmmu_targets_${target}" && \ + softmmu_targets="${softmmu_targets} ${target}-softmmu" + done + + for target in ${IUSE_USER_TARGETS} ; do + use "qemu_user_targets_${target}" && \ + user_targets="${user_targets} ${target}-linux-user" + done + + if [[ -z ${softmmu_targets} ]]; then + conf_opts="${conf_opts} --disable-system" + else + einfo "Building the following softmmu targets: ${softmmu_targets}" + fi + + if [[ -n ${user_targets} ]]; then + einfo "Building the following user targets: ${user_targets}" + conf_opts="${conf_opts} --enable-linux-user" + else + conf_opts="${conf_opts} --disable-linux-user" + fi + + # Fix QA issues. QEMU needs executable heaps and we need to mark it as such + conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" + + # Add support for static builds + use static && conf_opts="${conf_opts} --static" + + #config options + conf_opts="${conf_opts} + $(use_enable aio linux-aio) + $(use_enable bluetooth bluez) + $(use_enable brltty brlapi) + $(use_enable curl) + $(use_enable fdt) + $(use_enable hardened pie) + $(use_enable jpeg vnc-jpeg) + $(use_enable ncurses curses) + $(use_enable nss smartcard-nss) + $(use_enable opengl) + $(use_enable png vnc-png) + $(use_enable rbd) + $(use_enable sasl vnc-sasl) + $(use_enable sdl) + $(use_enable spice) + $(use_enable ssl vnc-tls) + $(use_enable threads vnc-thread) + $(use_enable vde) + $(use_enable vhost-net) + $(use_enable xen) + $(use_enable xattr attr) + --disable-darwin-user --disable-bsd-user + " + + # audio options + audio_opts="oss" + use alsa && audio_opts="alsa ${audio_opts}" + use esd && audio_opts="esd ${audio_opts}" + use pulseaudio && audio_opts="pa ${audio_opts}" + use sdl && audio_opts="sdl ${audio_opts}" + + set -- --prefix="${EPREFIX}"/usr \ + --sysconfdir="${EPREFIX}"/etc \ + --disable-strip \ + --disable-werror \ + --disable-kvm \ + --disable-libiscsi \ + --enable-nptl \ + --enable-uuid \ + ${conf_opts} \ + --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \ + --audio-drv-list="${audio_opts}" \ + --target-list="${softmmu_targets} ${user_targets}" \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" + + echo ./configure "$@" # show actual options + ./configure "$@" || die "configure failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if [[ -n ${softmmu_targets} ]]; then + if use qemu-ifup; then + exeinto /etc/qemu + doexe "${FILESDIR}"/qemu-if{up,down} + fi + fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt || die + newdoc pc-bios/README README.pc-bios || die + dohtml qemu-doc.html qemu-tech.html || die +} + +pkg_postinst() { + use qemu-ifup || return + elog "You will need the Universal TUN/TAP driver compiled into your" + elog "kernel or loaded as a module to use the virtual network device" + elog "if using -net tap. You will also need support for 802.1d" + elog "Ethernet Bridging and a configured bridge if using the provided" + elog "qemu-ifup script from /etc/qemu." + echo +} -- cgit v1.2.3-65-gdbad