From 517e88684054366d75397951101fe3192d52fd20 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 14 Feb 2013 10:59:45 -0500 Subject: [PATCH] Update qemu ebuilds. --- app-emulation/qemu/Manifest | 7 + .../qemu/files/qemu-1.2.0-cflags.patch | 15 + app-emulation/qemu/files/qemu-binfmt.initd-r1 | 136 ++++++ app-emulation/qemu/qemu-1.2.1.ebuild | 321 ++++++++++++++ app-emulation/qemu/qemu-1.2.2-r3.ebuild | 415 ++++++++++++++++++ app-emulation/qemu/qemu-1.2.2.ebuild | 321 ++++++++++++++ 6 files changed, 1215 insertions(+) create mode 100644 app-emulation/qemu/files/qemu-1.2.0-cflags.patch create mode 100644 app-emulation/qemu/files/qemu-binfmt.initd-r1 create mode 100644 app-emulation/qemu/qemu-1.2.1.ebuild create mode 100644 app-emulation/qemu/qemu-1.2.2-r3.ebuild create mode 100644 app-emulation/qemu/qemu-1.2.2.ebuild diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 55a9079..511dc70 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,4 +1,11 @@ AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 +AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861 AUX qemu-1.2.0-fix-mipsen.patch 684 SHA256 e4e9695c091d3b8ffc1afb24c3d59fc61bb08bdb3e25b7be5a36d0b327ba4b55 SHA512 25c3b6ce6140cca2ed76ca75d623730c78873f8e5b53d9f80362df376effd7755b41420d55ec19dd652b47f2c6aea01e2cae9dc75952a4ffae871841ba27142c WHIRLPOOL 99d2e15c00d24db9fd7765290efaa6f69bb42f828227e3b5bfe68027b25ddae173c9cdf49b8d84facd8372d911e32a8bd0ed2aa6bdbb083c67d467d93bd29f67 +AUX qemu-binfmt.initd-r1 7139 SHA256 d742ff5261603649c6126edee676ead11d9b0bfe93871580d4d25c9dd987e8b5 SHA512 c34bba1d00db0ed79093e86099a54599f636b5925dddbe39786ae848d7bba10c44608c2720a52fc96cac6a7b2bacebb197c66b5e54bb44b18905d2fa056d0564 WHIRLPOOL c6d3380e6d6d6e60b226245189311a549bafd082f8c264c72f984ec0bb491721ed2a28824b4df6283088b7fb303d23c9d187bb574129839ec4e2017a6b6ff192 DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e +DIST qemu-1.2.1.tar.bz2 9872533 SHA256 33b1e711790cd468bda703c2b101d7b961d8e6d745c67c07ef63945f967fb046 SHA512 2e8ec7d9ce26b754b544b5fcf51ba8ee458a63cc141e30da13996ac191cc21c381db9b13c4747f23c3f2c8e40c908aea30d2a3619bd5040e7e812efac635e424 WHIRLPOOL be42e2aa405b0cd30ed019b77ee184b1e7ea42ef0db06b6bb316af8ec1f8db013ace08504483c31b35dd3dde88a8af432a6e479c1dd3b054cf596aeff95a8c8f +DIST qemu-1.2.2.tar.bz2 9871919 SHA256 27a66629136cf6cefe4875a5d6fce04eb521cfc9e0ca2523335ca72c45be8625 SHA512 74a0040de3c03760a6aee9100acecc672853e5442e3ead3ee6abd191a61d3ed4f9157c692a6dadb8b18f86371fd62034d05ca65195703778fe17316810596915 WHIRLPOOL c54d05d7d1490a95c2c8bc60eee45b524ad9f7556a67e8de9ffc7f5ddb948a471059f31d538b8449ad8552da534c9593755292fadc9a652e38cbfcbb039f9b62 EBUILD qemu-1.2.0.ebuild 10719 SHA256 d11f8e53da4b319d9f5b341079de12d7ea448796de4db18866e37abaf8f1d9d3 SHA512 cc4af07d7de8b8eb2835433b9adc9e322b8f047eea960d733409e48e8d2973081e2f41873bf5409320fe2376ccb5030b5c67e2db95c4bbbb362f8901ecd2d2dc WHIRLPOOL d0a2daeded97c129e90396bfbc2f11bdf374be1d7a1701dd02156e307c4c2a376640efccc372951a2afce2da10be0034559dcce52e31f38417f8d74db6a50230 +EBUILD qemu-1.2.1.ebuild 10526 SHA256 c79f49cd43e1527610f279501421c4c2e4da4596a4caf38a48b277d93331f2db SHA512 e8acfcf2630a9242826862dce27ecab05c2c570bc4a6ef5f42372b2d195c49aed8a93096a27608fce6674cc7e39d40384d0ede7954878964fbd15c8ce3ca146c WHIRLPOOL 3df1114c7684694f94f4dbc7a3cca013fd452967c596ced99a3b819fd6e1a15fbcd168fd61e98dea1bd3b477a5dcbf06f355d283130e541c1761d94fff094a16 +EBUILD qemu-1.2.2-r3.ebuild 13225 SHA256 5be85e6bd61beb9d836d47efdc7f6715a29eb41e0c44a98259b1406cb8ac100d SHA512 403887b43f5e10379683bd60629d52513211c0a182f0dd04a3f15103dbaca89f4e6dd0ebf17fea54457f76e4851933f59633dd3da0140796428af118cb988b53 WHIRLPOOL 91824ab55be553ed022c6fa27e74ed1bd2b987c9c7027823ef66fe3f8997daaec090dae6dbf656b938dad06499ccca9b2138562445927d533915e88973feb37d +EBUILD qemu-1.2.2.ebuild 10559 SHA256 e2c4292277e1d07d1ad7b1779f2792867743a1448294148f1afd78bca03ffa32 SHA512 3ab22aa31b43c6382b06eb220ede940a7ff9ee7fc2d5c4d89cf6f5672af91633aa42ff5b9874fd1c0ff909c634f549cfefa20e4a69f0ce18fd5df03148030568 WHIRLPOOL 3bb46291b66773c3baeed2fea6916d0ecc39353789783feca1e6b0f7870c7f100be2442a14355a5d05575293201d6c3276b4b91ea5e0b40d7baf53a9e5f872fe diff --git a/app-emulation/qemu/files/qemu-1.2.0-cflags.patch b/app-emulation/qemu/files/qemu-1.2.0-cflags.patch new file mode 100644 index 0000000..9aaa1d6 --- /dev/null +++ b/app-emulation/qemu/files/qemu-1.2.0-cflags.patch @@ -0,0 +1,15 @@ +don't override user cflags + +--- a/configure ++++ b/configure +@@ -2995,10 +2995,6 @@ fi + # End of CC checks + # After here, no more $cc or $ld runs + +-if test "$debug" = "no" ; then +- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS" +-fi +- + # Disable zero malloc errors for official releases unless explicitly told to + # enable/disable + if test -z "$zero_malloc" ; then diff --git a/app-emulation/qemu/files/qemu-binfmt.initd-r1 b/app-emulation/qemu/files/qemu-binfmt.initd-r1 new file mode 100644 index 0000000..d2c0b73 --- /dev/null +++ b/app-emulation/qemu/files/qemu-binfmt.initd-r1 @@ -0,0 +1,136 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.1 2013/01/19 03:42:06 cardoe Exp $ + +# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel + +depend() { + after procfs +} + +start() { + ebegin "Registering qemu-user binaries" + + if [[ ! -d /proc/sys/fs/binfmt_misc ]] ; then + /sbin/modprobe binfmt_misc + fi + + if [[ ! -d /proc/sys/fs/binfmt_misc ]] ; then + eerror "You need \"binfmt_misc\" support in your kernel." + eend 1 + return 1 + fi + + if [[ ! -f /proc/sys/fs/binfmt_misc/register ]] ; then + mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &> /dev/null + local result=$? + + if [[ $result -ne 0 ]] ; then + eend $result + return $result + fi + fi + + # probe cpu type + cpu=`uname -m` + case "$cpu" in + i386|i486|i586|i686|i86pc|BePC|x86_64) + cpu="i386" + ;; + m68k) + cpu="m68k" + ;; + mips*) + cpu="mips" + ;; + "Power Macintosh"|ppc|ppc64) + cpu="ppc" + ;; + armv[4-9]*) + cpu="arm" + ;; + sparc*) + cpu="sparc" + ;; + esac + + # register the interpreter for each cpu except for the native one + if [ $cpu != "i386" -a -x "/usr/bin/qemu-i386" ] ; then + echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register + echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "alpha" -a -x "/usr/bin/qemu-alpha" ] ; then + echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "arm" -a -x "/usr/bin/qemu-arm" ] ; then + echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "arm" -a -x "/usr/bin/qemu-armeb" ] ; then + echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sparc" -a -x "/usr/bin/qemu-sparc" ] ; then + echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "ppc" -a -x "/usr/bin/qemu-ppc" ] ; then + echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "m68k" -a -x "/usr/bin/qemu-m68k" ] ; then + echo 'Please check cpu value and header information for m68k!' + echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips" ] ; then + # FIXME: We could use the other endianness on a MIPS host. + echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsel" ] ; then + echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32" ] ; then + echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32el" ] ; then + echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64" ] ; then + echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64el" ] ; then + echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4" ] ; then + echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4eb" ] ; then + echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:P' > /proc/sys/fs/binfmt_misc/register + fi + if [ $cpu != "s390x" -a -x "/usr/local/bin/qemu-s390x" ] ; then + echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:P' > /proc/sys/fs/binfmt_misc/register + fi + eend $? +} + +stop() { + ebegin "Unregistering qemu-user binaries" + local arches + + arches="${arches} i386 i486" + arches="${arches} alpha" + arches="${arches} arm armeb" + arches="${arches} sparc" + arches="${arches} ppc" + arches="${arches} m68k" + arches="${arches} mips mipsel mipsn32 mipsn32el mips64 mips64el" + arches="${arches} sh4 sh4eb" + arches="${arches} s390x" + + for a in ${arches}; do + if [[ -f /proc/sys/fs/binfmt_misc/$a ]] ; then + echo '-1' > /proc/sys/fs/binfmt_misc/$a + fi + done + + eend $? +} + +# vim: ts=4 : diff --git a/app-emulation/qemu/qemu-1.2.1.ebuild b/app-emulation/qemu/qemu-1.2.1.ebuild new file mode 100644 index 0000000..9a0142a --- /dev/null +++ b/app-emulation/qemu/qemu-1.2.1.ebuild @@ -0,0 +1,321 @@ +# 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.2.1.ebuild,v 1.3 2012/12/05 21:37:29 cardoe Exp $ + +EAPI="4" + +PYTHON_DEPEND="2" +inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user + +SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2" +KEYWORDS="" + +DESCRIPTION="Free machine emulator and virtualizer" +HOMEPAGE="http://www.qemu.org/" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" +IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ +kernel_FreeBSD kvm mixemu ncurses opengl +png pulseaudio python rbd sasl \ ++seccomp sdl smartcard spice static systemtap tci +threads tls usbredir \ ++uuid vde +vhost-net virtfs +vnc xattr xen xfs" + +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" + +# Setup the default SoftMMU targets, while using the loops +# below to setup the other targets. +REQUIRED_USE="|| (" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} qemu_softmmu_targets_${target}" + REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" +done +REQUIRED_USE="${REQUIRED_USE} )" + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} qemu_user_targets_${target}" +done + +# Block USE flag configurations known to not work +REQUIRED_USE="${REQUIRED_USE} + static? ( !alsa !pulseaudio !bluetooth ) + virtfs? ( xattr )" + +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-apps/pciutils[static-libs(+)] + sys-libs/zlib[static-libs(+)] + aio? ( dev-libs/libaio[static-libs(+)] ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) + jpeg? ( virtual/jpeg[static-libs(+)] ) + ncurses? ( sys-libs/ncurses[static-libs(+)] ) + png? ( media-libs/libpng[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] ) + spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) + tls? ( net-libs/gnutls[static-libs(+)] ) + uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + !app-emulation/kqemu + sys-firmware/ipxe + >=sys-firmware/seabios-1.7.0 + sys-firmware/sgabios + sys-firmware/vgabios + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + brltty? ( app-accessibility/brltty ) + opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( =dev-lang/python-2*[ncurses] ) + sdl? ( media-libs/libsdl[X] ) + smartcard? ( dev-libs/nss ) + spice? ( >=app-emulation/spice-protocol-0.12.0 ) + systemtap? ( dev-util/systemtap ) + usbredir? ( + >=sys-apps/usbredir-0.3.4 + x86? ( kvm', then have re-login." + elog + elog "The ssl USE flag was renamed to tls, so adjust your USE flags." + elog "The nss USE flag was renamed to smartcard, so adjust your USE flags." + fi +} diff --git a/app-emulation/qemu/qemu-1.2.2-r3.ebuild b/app-emulation/qemu/qemu-1.2.2-r3.ebuild new file mode 100644 index 0000000..971ce06 --- /dev/null +++ b/app-emulation/qemu/qemu-1.2.2-r3.ebuild @@ -0,0 +1,415 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r3.ebuild,v 1.2 2013/02/10 21:50:04 cardoe Exp $ + +EAPI=5 + + +PYTHON_DEPEND="2:2.4" +inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev + +SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + +DESCRIPTION="Free machine emulator and virtualizer" +HOMEPAGE="http://www.qemu.org/" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" +IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ +kernel_FreeBSD kvm mixemu ncurses opengl +png pulseaudio python rbd sasl \ ++seccomp sdl selinux smartcard spice static static-softmmu static-user \ +systemtap tci +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr \ +xen xfs" + +COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips +mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" +IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus" + +# Setup the default SoftMMU targets, while using the loops +# below to setup the other targets. +REQUIRED_USE="|| (" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} qemu_softmmu_targets_${target}" + REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" +done +REQUIRED_USE="${REQUIRED_USE} )" + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} qemu_user_targets_${target}" +done + +# Block USE flag configurations known to not work +REQUIRED_USE="${REQUIRED_USE} + kvm? ( kernel_linux ) + static? ( static-softmmu static-user ) + static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) + virtfs? ( xattr )" + +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-apps/pciutils[static-libs(+)] + sys-libs/zlib[static-libs(+)] + aio? ( dev-libs/libaio[static-libs(+)] ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) + jpeg? ( virtual/jpeg[static-libs(+)] ) + ncurses? ( sys-libs/ncurses[static-libs(+)] ) + png? ( media-libs/libpng[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) + spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) + tls? ( net-libs/gnutls[static-libs(+)] ) + uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" +RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} ) + !app-emulation/kqemu + qemu_softmmu_targets_i386? ( + sys-firmware/ipxe + ~sys-firmware/seabios-1.7.1 + ~sys-firmware/sgabios-0.1_pre8 + ~sys-firmware/vgabios-0.7a + ) + qemu_softmmu_targets_x86_64? ( + sys-firmware/ipxe + ~sys-firmware/seabios-1.7.1 + ~sys-firmware/sgabios-0.1_pre8 + ~sys-firmware/vgabios-0.7a + ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + brltty? ( app-accessibility/brltty ) + opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( =dev-lang/python-2*[ncurses] ) + sdl? ( media-libs/libsdl[X] ) + selinux? ( sec-policy/selinux-qemu ) + smartcard? ( dev-libs/nss ) + spice? ( >=app-emulation/spice-protocol-0.12.2 ) + systemtap? ( dev-util/systemtap ) + usbredir? ( ~sys-apps/usbredir-0.4.4 ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-text/texi2html ) + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static-softmmu? ( ${LIB_DEPEND} )" + +STRIP_MASK="/usr/share/qemu/palcode-clipper" + +QA_PREBUILT=" + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/palcode-clipper" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or32 + 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-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32" + +qemu_support_kvm() { + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \ + use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \ + use qemu_softmmu_targets_s390x; then + return 0 + fi + + return 1 +} + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + + enewgroup kvm 78 +} + +src_prepare() { + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target || die + + python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" + python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap" + + epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch + + # Fix ld and objcopy being called directly + tc-export LD OBJCOPY + + # Verbose builds + MAKEOPTS+=" V=1" + + epatch_user +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function $FUNCNAME "$@" + + local buildtype=$1 + local builddir=$2 + local conf_opts audio_opts + local static_flag="static-${buildtype}" + + conf_opts="--prefix=/usr" + conf_opts+=" --sysconfdir=/etc" + conf_opts+=" --docdir=/usr/share/doc/${PF}/html" + conf_opts+=" --disable-bsd-user" + conf_opts+=" --disable-guest-agent" + conf_opts+=" --disable-libiscsi" + conf_opts+=" --disable-strip" + conf_opts+=" --disable-werror" + conf_opts+=" --python=python2" + + # audio options + audio_opts="oss" + use alsa && audio_opts="alsa,${audio_opts}" + use sdl && audio_opts="sdl,${audio_opts}" + use pulseaudio && audio_opts="pa,${audio_opts}" + + if [[ ${buildtype} == "user" ]]; then + conf_opts+=" --enable-linux-user" + conf_opts+=" --disable-system" + conf_opts+=" --target-list=${user_targets}" + conf_opts+=" --disable-bluez" + conf_opts+=" --disable-sdl" + fi + + if [[ ${buildtype} == "softmmu" ]]; then + conf_opts+=" --disable-linux-user" + conf_opts+=" --enable-system" + conf_opts+=" --target-list=${softmmu_targets}" + conf_opts+=" $(use_enable bluetooth bluez)" + conf_opts+=" $(use_enable sdl)" + conf_opts+=" $(use_enable aio linux-aio)" + conf_opts+=" $(use_enable brltty brlapi)" + conf_opts+=" $(use_enable caps cap-ng)" + conf_opts+=" $(use_enable curl)" + conf_opts+=" $(use_enable fdt)" + conf_opts+=" $(use_enable jpeg vnc-jpeg)" + conf_opts+=" $(use_enable kvm)" + conf_opts+=" $(use_enable kernel_linux nptl)" + conf_opts+=" $(use_enable ncurses curses)" + conf_opts+=" $(use_enable opengl)" + conf_opts+=" $(use_enable png vnc-png)" + conf_opts+=" $(use_enable rbd)" + conf_opts+=" $(use_enable sasl vnc-sasl)" + conf_opts+=" $(use_enable seccomp)" + conf_opts+=" $(use_enable smartcard smartcard)" + conf_opts+=" $(use_enable smartcard smartcard-nss)" + conf_opts+=" $(use_enable spice)" + conf_opts+=" $(use_enable tls vnc-tls)" + conf_opts+=" $(use_enable usbredir usb-redir)" + conf_opts+=" $(use_enable uuid)" + conf_opts+=" $(use_enable vde)" + conf_opts+=" $(use_enable vhost-net)" + conf_opts+=" $(use_enable virtfs)" + conf_opts+=" $(use_enable vnc)" + conf_opts+=" $(use_enable xattr attr)" + conf_opts+=" $(use_enable xen)" + conf_opts+=" $(use_enable xen xen-pci-passthrough)" + conf_opts+=" $(use_enable xfs xfsctl)" + use mixemu && conf_opts+=" --enable-mixemu" + conf_opts+=" --audio-drv-list=${audio_opts}" + fi + + conf_opts+=" $(use_enable debug debug-info)" + conf_opts+=" $(use_enable debug debug-tcg)" + conf_opts+=" $(use_enable doc docs)" + conf_opts+=" $(use_enable tci tcg-interpreter)" + + # Add support for SystemTAP + use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace" + + # Add support for static builds + use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie" + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if ! use ${static_flag} && gcc-specs-pie; then + conf_opts="${conf_opts} --enable-pie" + fi + + einfo "./configure ${conf_opts}" + cd ${builddir} + ../configure \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" \ + ${conf_opts} \ + || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak +} + +src_configure() { + softmmu_targets= + 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 + + [[ -n ${softmmu_targets} ]] && \ + einfo "Building the following softmmu targets: ${softmmu_targets}" + + [[ -n ${user_targets} ]] && \ + einfo "Building the following user targets: ${user_targets}" + + if [[ -n ${softmmu_targets} ]]; then + mkdir "${S}/softmmu-build" + qemu_src_configure "softmmu" "${S}/softmmu-build" + fi + + if [[ -n ${user_targets} ]]; then + mkdir "${S}/user-build" + qemu_src_configure "user" "${S}/user-build" + fi +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets + newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + if use kernel_linux; then + udev_dorules "${FILESDIR}"/65-kvm.rules + fi + + if use qemu_softmmu_targets_x86_64 ; then + dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm + ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed" + ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" + ewarn "your libvirt configs or other wrappers for ${PN}" + elif use x86 || use amd64; then + elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" + elog "of the /usr/bin/qemu-kvm symlink." + fi + + use python && dobin "${S}/scripts/kvm/kvm_stat" + use python && dobin "${S}/scripts/kvm/vmxcap" + fi + + cd "${S}" + dodoc Changelog MAINTAINERS TODO pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Avoid collision with app-emulation/libcacard + use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" + + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi + + # Remove vgabios since we're using the vgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin + dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi +} + +pkg_postinst() { + if qemu_support_kvm; then + elog "If you don't have kvm compiled into the kernel, make sure you have" + elog "the kernel module loaded before running kvm. The easiest way to" + elog "ensure that the kernel module is loaded is to load it on boot." + elog "For AMD CPUs the module is called 'kvm-amd'" + elog "For Intel CPUs the module is called 'kvm-intel'" + elog "Please review /etc/conf.d/modules for how to load these" + elog + elog "Make sure your user is in the 'kvm' group" + elog "Just run 'gpasswd -a kvm', then have re-login." + elog + fi +} diff --git a/app-emulation/qemu/qemu-1.2.2.ebuild b/app-emulation/qemu/qemu-1.2.2.ebuild new file mode 100644 index 0000000..ed6b897 --- /dev/null +++ b/app-emulation/qemu/qemu-1.2.2.ebuild @@ -0,0 +1,321 @@ +# 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.2.1.ebuild,v 1.3 2012/12/05 21:37:29 cardoe Exp $ + +EAPI="4" + +PYTHON_DEPEND="2" +inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user + +SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + +DESCRIPTION="Free machine emulator and virtualizer" +HOMEPAGE="http://www.qemu.org/" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" +IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ +kernel_FreeBSD kvm mixemu ncurses opengl +png pulseaudio python rbd sasl \ ++seccomp sdl smartcard spice static systemtap tci +threads tls usbredir \ ++uuid vde +vhost-net virtfs +vnc xattr xen xfs" + +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" + +# Setup the default SoftMMU targets, while using the loops +# below to setup the other targets. +REQUIRED_USE="|| (" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} qemu_softmmu_targets_${target}" + REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" +done +REQUIRED_USE="${REQUIRED_USE} )" + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} qemu_user_targets_${target}" +done + +# Block USE flag configurations known to not work +REQUIRED_USE="${REQUIRED_USE} + static? ( !alsa !pulseaudio !bluetooth ) + virtfs? ( xattr )" + +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-apps/pciutils[static-libs(+)] + sys-libs/zlib[static-libs(+)] + aio? ( dev-libs/libaio[static-libs(+)] ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) + jpeg? ( virtual/jpeg[static-libs(+)] ) + ncurses? ( sys-libs/ncurses[static-libs(+)] ) + png? ( media-libs/libpng[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] ) + spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) + tls? ( net-libs/gnutls[static-libs(+)] ) + uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + !app-emulation/kqemu + sys-firmware/ipxe + >=sys-firmware/seabios-1.7.0 + sys-firmware/sgabios + sys-firmware/vgabios + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + brltty? ( app-accessibility/brltty ) + opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( =dev-lang/python-2*[ncurses] ) + sdl? ( media-libs/libsdl[X] ) + smartcard? ( dev-libs/nss ) + spice? ( >=app-emulation/spice-protocol-0.12.0 ) + systemtap? ( dev-util/systemtap ) + usbredir? ( + >=sys-apps/usbredir-0.3.4 + x86? ( kvm', then have re-login." + elog + elog "The ssl USE flag was renamed to tls, so adjust your USE flags." + elog "The nss USE flag was renamed to smartcard, so adjust your USE flags." + fi +} -- 2.43.0