diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2012-02-19 23:20:35 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2012-02-19 23:20:35 +0000 |
commit | 7eb11bfc1fbbc47b57f58d8a4ce961e9cb45d3a1 (patch) | |
tree | 3812d95c7cadedb347b41e60768c1dab307b613b /app-emulation | |
parent | Major overhaul to the qemu-kvm ebuild to clean up depends, messages, and supp... (diff) | |
download | historical-7eb11bfc1fbbc47b57f58d8a4ce961e9cb45d3a1.tar.gz historical-7eb11bfc1fbbc47b57f58d8a4ce961e9cb45d3a1.tar.bz2 historical-7eb11bfc1fbbc47b57f58d8a4ce961e9cb45d3a1.zip |
Drop older version
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 5 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/Manifest | 5 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild | 286 |
3 files changed, 5 insertions, 291 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 190ba6eca8fa..4de4cd5c1c99 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.99 2012/02/19 23:19:22 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.100 2012/02/19 23:20:35 cardoe Exp $ + + 19 Feb 2012; Doug Goldstein <cardoe@gentoo.org> -qemu-kvm-0.14.1-r2.ebuild: + Drop older version *qemu-kvm-1.0-r3 (19 Feb 2012) diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index bc7d4ec59c83..1b75e788dc7e 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -10,14 +10,11 @@ AUX qemu-kvm-1.0-fix-qemu-system-ppc.patch 1071 RMD160 113a121abf72c9378f0c231e2 AUX qemu-kvm-1.0-per-target-i8259.patch 2765 RMD160 53208c75291cf9d16eab990bacdc18e28ec44a13 SHA1 c347ff7fc737af004245d3671ae87c7869b95198 SHA256 42b5905f4e2f0bb5bcdca1e14a669941c2d70ffb1e0b6969b69fc4435772abb2 AUX qemu-kvm-9999-fix-nonkvm-arches.patch 917 RMD160 e3ef75fa1807b98343e9eeda8d4113d2f783ec86 SHA1 f8545c30d4e083830b6a057af216cc8f881f9d51 SHA256 e471faa99d90058be593dcbc82284f395913b4484b0d96e8054150e68b4d9ad6 AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7cab50e191f1a3ea SHA1 00f36fd0197fa9d359e28a9ef2f56a1ee860fddf SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3 -DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982 -DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27 DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e -EBUILD qemu-kvm-0.14.1-r2.ebuild 9077 RMD160 7d9801a9213e1f28e7f8a4124231fc090917cfa6 SHA1 abcdb49577ce3d900493f55685b02ffe376f24e1 SHA256 d9906fbabb4ba264d5e011db8236e81cafe0e1126e9564550a7a4d1e69c9daba EBUILD qemu-kvm-0.15.1-r1.ebuild 9648 RMD160 c32ecba429c843027756a6978c71a38b5d617fac SHA1 8f0c697a859f3336b95a6a8ab7dcb35d49913d6e SHA256 ada1fd9e880e635917aee17c5c0aba97f4af05ed7362bd0eda8ced4b72d34ac9 EBUILD qemu-kvm-1.0-r2.ebuild 11356 RMD160 b319e79efa800528527616d633ca51ae87038cad SHA1 3bf7311a455fce7189bb76a9e5bc12cb46175535 SHA256 af933382b9556a1fc9b933e17999727ca5b54141089d8517f5a9dd8fbc55df64 EBUILD qemu-kvm-1.0-r3.ebuild 11513 RMD160 4086a2380ba273775897d5d66a651bc3d746c680 SHA1 cb1475d9186edd88db8eee719e00388358cbd705 SHA256 0fbba54bf21b7458ad8d5b62438af6ed8abb45c93baa4afc873ab2f8f601145a EBUILD qemu-kvm-9999.ebuild 10629 RMD160 f57e19d7ecf1969610c69e4d65b5354d358a2e01 SHA1 e747d70656eb8ae82ec64b3c34c044e8c2b12a4b SHA256 560934c222cfec36855f99fb10301d7c076392480a36ef6f120210732fecaf8e -MISC ChangeLog 20897 RMD160 9a43b30813e4cdc271c42459d41a82dea32aa333 SHA1 538b15f06def29c14290ff5d20bfe1753988a175 SHA256 2e26d8d35ff06f1df3c7984e21aade09d5e42982eb80d9d204602497393bd3d9 +MISC ChangeLog 20998 RMD160 ba34d2da378b3dce656905e76df443900051ee34 SHA1 e7d56bfa48e2611998c9e5050c87fbc257322856 SHA256 25a724722a79d7a9f4f67e3a21e1dfebc66e0510c73f6be5a2701034e6c571fe MISC metadata.xml 1992 RMD160 ec4b74cafe7de9a4fdc69a1c458f0a140f495fd4 SHA1 f1cc577f619ce95ca9a1b9c25f28d7b92072c22c SHA256 eb68d8ef0922a478ecb5a84632bed52ab041a7d3f8383884a7ede994e400a7b5 diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild deleted file mode 100644 index 72e126602f02..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild,v 1.5 2012/01/22 21:23:30 slyfox Exp $ - -BACKPORTS=2 - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz - ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}" - KEYWORDS="amd64 ~ppc ~ppc64 x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -# xen is disabled until the deps are fixed -IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses \ -png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \ -+vhost-net xen" -# static, depends on libsdl being built with USE=static-libs, which can not -# be expressed in current EAPI's - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha 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" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - if [ "x${target}" = "xx86_64" ]; then - continue - fi - IUSE="${IUSE} qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} qemu_user_targets_${target}" -done - -RESTRICT="test" - -RDEPEND=" - !app-emulation/kqemu - !app-emulation/qemu - !app-emulation/qemu-softmmu - !app-emulation/qemu-user - !app-emulation/qemu-kvm-spice - 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 ) - 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 ) - ssl? ( net-libs/gnutls ) - vde? ( net-misc/vde ) - xen? ( app-emulation/xen-tools ) -" - -DEPEND="${RDEPEND} - app-text/texi2html - >=sys-kernel/linux-headers-2.6.35 - ssl? ( dev-util/pkgconfig ) -" - -kvm_kern_warn() { - eerror "Please enable KVM support in your kernel, found at:" - eerror - eerror " Virtualization" - eerror " Kernel-based Virtual Machine (KVM) support" - eerror -} - -pkg_setup() { - if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then - eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" - fi - - if ! use qemu_softmmu_targets_x86_64 && use x86 ; then - eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" - fi - - if kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - eerror "Either upgrade your kernel" - else - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - kvm_kern_warn - elif ! linux_chkconfig_present KVM; then - kvm_kern_warn - fi - if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then - ewarn "You have to enable CONFIG_VHOST_NET in the kernel" - ewarn "to have vhost-net support." - fi - fi - - enewgroup kvm -} - -src_prepare() { - # 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 - - # remove part to make udev happy - sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die - - # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones - # to the qemu-devel ml - bug 337988 - epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ - epatch -} - -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 - eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm" - die "At least 1 SoftMMU target must be enabled" - else - einfo "Building the following softmmu targets: ${softmmu_targets}" - fi - - if [ ! -z "${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" - - # Support debug USE flag - use debug && conf_opts="${conf_opts} --enable-debug --disable-strip" - - # Fix the $(prefix)/etc issue - conf_opts="${conf_opts} --sysconfdir=/etc" - - #config options - conf_opts="${conf_opts} $(use_enable aio linux-aio)" - conf_opts="${conf_opts} $(use_enable bluetooth bluez)" - conf_opts="${conf_opts} $(use_enable brltty brlapi)" - conf_opts="${conf_opts} $(use_enable curl)" - conf_opts="${conf_opts} $(use_enable fdt)" - conf_opts="${conf_opts} $(use_enable hardened user-pie)" - conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)" - conf_opts="${conf_opts} $(use_enable ncurses curses)" - conf_opts="${conf_opts} $(use_enable png vnc-png)" - conf_opts="${conf_opts} $(use_enable rbd)" - conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" - conf_opts="${conf_opts} $(use_enable sdl)" - conf_opts="${conf_opts} $(use_enable spice)" - conf_opts="${conf_opts} $(use_enable ssl vnc-tls)" - conf_opts="${conf_opts} $(use_enable threads vnc-thread)" - conf_opts="${conf_opts} $(use_enable vde)" - conf_opts="${conf_opts} $(use_enable vhost-net)" - conf_opts="${conf_opts} $(use_enable xen)" - conf_opts="${conf_opts} --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}" - ./configure --prefix=/usr \ - --disable-strip \ - --disable-werror \ - --enable-kvm \ - --enable-nptl \ - --enable-uuid \ - ${conf_opts} \ - --audio-drv-list="${audio_opts}" \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" \ - || die "configure failed" - - # this is for qemu upstream's threaded support which is - # in development and broken - # the kvm project has its own support for threaded IO - # which is always on and works - # --enable-io-thread \ -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if [ ! -z "${softmmu_targets}" ]; then - insinto /$(get_libdir)/udev/rules.d/ - doins kvm/scripts/65-kvm.rules || die - - if use qemu-ifup; then - insinto /etc/qemu/ - insopts -m0755 - doins kvm/scripts/qemu-ifup || die - fi - - if use qemu_softmmu_targets_x86_64 ; then - dobin "${FILESDIR}"/qemu-kvm - dosym /usr/bin/qemu-kvm /usr/bin/kvm - else - elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" - elog "of /usr/bin/qemu-kvm and /usr/bin/kvm" - 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() { - - if [ ! -z "${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 <USER> kvm', then have <USER> re-login." - elog - 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 "kvm-ifup script from /etc/kvm." - elog - elog "The gnutls use flag was renamed to ssl, so adjust your use flags." - fi -} |