From 5602a762e20dae8aed5982a5c6536daaf0a6f06a Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 4 Nov 2012 20:15:53 -0500 Subject: [PATCH] Add qemu ebuild that builds REAL qemu. --- app-emulation/qemu/Manifest | 4 + app-emulation/qemu/files/65-kvm.rules | 1 + .../qemu/files/qemu-1.2.0-fix-mipsen.patch | 18 + app-emulation/qemu/qemu-1.2.0.ebuild | 327 ++++++++++++++++++ 4 files changed, 350 insertions(+) create mode 100644 app-emulation/qemu/Manifest create mode 100644 app-emulation/qemu/files/65-kvm.rules create mode 100644 app-emulation/qemu/files/qemu-1.2.0-fix-mipsen.patch create mode 100644 app-emulation/qemu/qemu-1.2.0.ebuild diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest new file mode 100644 index 0000000..55a9079 --- /dev/null +++ b/app-emulation/qemu/Manifest @@ -0,0 +1,4 @@ +AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 +AUX qemu-1.2.0-fix-mipsen.patch 684 SHA256 e4e9695c091d3b8ffc1afb24c3d59fc61bb08bdb3e25b7be5a36d0b327ba4b55 SHA512 25c3b6ce6140cca2ed76ca75d623730c78873f8e5b53d9f80362df376effd7755b41420d55ec19dd652b47f2c6aea01e2cae9dc75952a4ffae871841ba27142c WHIRLPOOL 99d2e15c00d24db9fd7765290efaa6f69bb42f828227e3b5bfe68027b25ddae173c9cdf49b8d84facd8372d911e32a8bd0ed2aa6bdbb083c67d467d93bd29f67 +DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e +EBUILD qemu-1.2.0.ebuild 10719 SHA256 d11f8e53da4b319d9f5b341079de12d7ea448796de4db18866e37abaf8f1d9d3 SHA512 cc4af07d7de8b8eb2835433b9adc9e322b8f047eea960d733409e48e8d2973081e2f41873bf5409320fe2376ccb5030b5c67e2db95c4bbbb362f8901ecd2d2dc WHIRLPOOL d0a2daeded97c129e90396bfbc2f11bdf374be1d7a1701dd02156e307c4c2a376640efccc372951a2afce2da10be0034559dcce52e31f38417f8d74db6a50230 diff --git a/app-emulation/qemu/files/65-kvm.rules b/app-emulation/qemu/files/65-kvm.rules new file mode 100644 index 0000000..c2f7317 --- /dev/null +++ b/app-emulation/qemu/files/65-kvm.rules @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/app-emulation/qemu/files/qemu-1.2.0-fix-mipsen.patch b/app-emulation/qemu/files/qemu-1.2.0-fix-mipsen.patch new file mode 100644 index 0000000..02a9a22 --- /dev/null +++ b/app-emulation/qemu/files/qemu-1.2.0-fix-mipsen.patch @@ -0,0 +1,18 @@ +Fixes link failure due to missing piix symbols. + + LINK mips-softmmu/qemu-system-mips +hw/mips/../mips_malta.o: In function `mips_malta_init': +mips_malta.c:(.text+0x2314): undefined reference to `piix4_pm_init' +collect2: error: ld returned 1 exit status +diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs +index 29a5d0d..89af0e9 100644 +--- a/hw/mips/Makefile.objs ++++ b/hw/mips/Makefile.objs +@@ -1,6 +1,7 @@ + obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o + obj-y += mips_addr.o mips_timer.o mips_int.o + obj-y += gt64xxx.o mc146818rtc.o ++obj-y += acpi.o acpi_piix4.o + obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o + + obj-y := $(addprefix ../,$(obj-y)) diff --git a/app-emulation/qemu/qemu-1.2.0.ebuild b/app-emulation/qemu/qemu-1.2.0.ebuild new file mode 100644 index 0000000..2725f43 --- /dev/null +++ b/app-emulation/qemu/qemu-1.2.0.ebuild @@ -0,0 +1,327 @@ +# 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.0.ebuild,v 1.2 2012/10/20 16:27:36 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 sdl \ +smartcard spice static systemtap tci 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} 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. x86_64 should be the only +# defaults on for qemu-kvm +IUSE="${IUSE} +qemu_softmmu_targets_x86_64" +REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + if [ "x${target}" = "xx86_64" ]; then + continue + fi + 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 + +REQUIRED_USE="${REQUIRED_USE} + static? ( !alsa !pulseaudio ) + amd64? ( qemu_softmmu_targets_x86_64 ) + x86? ( qemu_softmmu_targets_x86_64 ) + virtfs? ( xattr ) + kvm? ( kernel_linux )" + +# 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(+)] ) + 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 + !app-emulation/qemu + !=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.8.1 ) + systemtap? ( dev-util/systemtap ) + usbredir? ( sys-apps/usbredir ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools )" + +DEPEND="${RDEPEND} + app-text/texi2html + virtual/pkgconfig + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( ${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="${QA_PRESTRIPPED} + 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-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-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus" + +pkg_pretend() { + if use static; then + ewarn "USE=static is very much a moving target because of the packages" + ewarn "we depend on will have their static libs ripped out or wrapped" + ewarn "with USE=static-libs or USE=static due to continued dicsussion" + ewarn "on the mailing list about USE=static's place in Gentoo. As a" + ewarn "result what worked today may not work tomorrow." + fi +} + +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" + + epatch "${FILESDIR}"/${P}-fix-mipsen.patch + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch + + epatch_user +} + +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 + + einfo "Building the following softmmu targets: ${softmmu_targets}" + + 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 + + # Add support for SystemTAP + use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace" + + # 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 --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 && gcc-specs-pie; then + conf_opts="${conf_opts} --enable-pie" + fi + + # 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}" + use mixemu && conf_opts="${conf_opts} --enable-mixemu" + + # $(use_enable xen xen-pci-passthrough) for 1.2 + # $(use_enable debug debug-mon) goes away for 1.2 + # --disable-seccomp as in-tree seccomp is API incompatible (in-tree + # version is ancient) + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-bsd-user \ + --disable-guest-agent \ + --disable-libiscsi \ + --disable-strip \ + --disable-werror \ + --python=python2 \ + --disable-seccomp \ + $(use_enable aio linux-aio) \ + $(use_enable bluetooth bluez) \ + $(use_enable brltty brlapi) \ + $(use_enable caps cap-ng) \ + $(use_enable curl) \ + $(use_enable debug debug-info) \ + $(use_enable debug debug-tcg) \ + $(use_enable doc docs) \ + $(use_enable fdt) \ + $(use_enable jpeg vnc-jpeg) \ + $(use_enable kvm) \ + $(use_enable kernel_linux nptl) \ + $(use_enable ncurses curses) \ + $(use_enable opengl) \ + $(use_enable png vnc-png) \ + $(use_enable rbd) \ + $(use_enable sasl vnc-sasl) \ + $(use_enable sdl) \ + $(use_enable smartcard smartcard) \ + $(use_enable smartcard smartcard-nss) \ + $(use_enable spice) \ + $(use_enable tci tcg-interpreter) \ + $(use_enable tls vnc-tls) \ + $(use_enable usbredir usb-redir) \ + $(use_enable uuid) \ + $(use_enable vde) \ + $(use_enable vhost-net) \ + $(use_enable virtfs) \ + $(use_enable vnc) \ + $(use_enable xattr attr) \ + $(use_enable xen) \ + $(use_enable xen xen-pci-passthrough) \ + $(use_enable xfs xfsctl) \ + --audio-drv-list=${audio_opts} \ + --target-list="${softmmu_targets} ${user_targets}" \ + --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_install() { + emake DESTDIR="${ED}" install + + if use kvm && [[ -n ${softmmu_targets} ]]; then + insinto /lib/udev/rules.d/ + doins "${FILESDIR}"/65-kvm.rules + fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt + newdoc pc-bios/README README.pc-bios + + if use doc; then + dohtml qemu-doc.html qemu-tech.html || die + fi + + use python & dobin scripts/kvm/kvm_stat + + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + + # 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" + 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 + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}/usr/share/qemu/pxe-*.rom" + 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 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]]; 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 + 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.2