version bump. fix bug #304097 in the process
authorDoug Goldstein <cardoe@gentoo.org>
Tue, 2 Mar 2010 16:56:34 +0000 (16:56 +0000)
committerDoug Goldstein <cardoe@gentoo.org>
Tue, 2 Mar 2010 16:56:34 +0000 (16:56 +0000)
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

app-emulation/qemu-kvm/ChangeLog
app-emulation/qemu-kvm/Manifest
app-emulation/qemu-kvm/metadata.xml
app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild [new file with mode: 0644]
app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

index 1a40970ab38b8f120c7fa78eb1e79de48ce86ce4..6db46bca98561af6198f9999e8a3d240761c819d 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.19 2010/02/15 16:40:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.20 2010/03/02 16:56:34 cardoe Exp $
+
+*qemu-kvm-0.12.3 (02 Mar 2010)
+
+  02 Mar 2010; Doug Goldstein <cardoe@gentoo.org> +qemu-kvm-0.12.3.ebuild,
+  qemu-kvm-9999.ebuild, metadata.xml:
+  version bump. fix bug #304097 in the process
 
 *qemu-kvm-0.12.2-r2 (15 Feb 2010)
 
index a4174d7b0d613082730f6bb6882c0259dedff5bf..240a785e8a4f496cc7695e305c1deed2b928333f 100644 (file)
@@ -10,6 +10,7 @@ DIST qemu-kvm-0.12.1.1.tar.gz 4712192 RMD160 bb457854c79951bdb0db90da30bd31ac6a0
 DIST qemu-kvm-0.12.1.2.tar.gz 4712236 RMD160 55052450668310d6e167fe12e6a7a933cee62a3a SHA1 dee7359094757af77ea839bbfd9dca8826edcbd2 SHA256 472ddba26c30390dfcb3eb5f7925b442f6152062e919badf0a61586073eabdcc
 DIST qemu-kvm-0.12.1.tar.gz 4712004 RMD160 f2c7842301e5c68e91f291bb3d74e2019bb7ee3c SHA1 0c2a8bb7dd98a5214bbad5bc954ae3111646c8cd SHA256 c65c5afc43176b3031b52b664704269a79e40e9acdc0c1aae2bcc46875d3051a
 DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e26b8 SHA1 27bb9b55e6539c0dc6b57e08812df76b02544c62 SHA256 82a6291857f67f84da259ee30f6d46699b73e38964ef82fb6c8000386e4baf5a
+DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2
 EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f288ff SHA1 60f6d85c50b14c3926e5e7e5f44e576bbf916d6a SHA256 a3d6efc3bcf9f169bbcad3ebe1dd0efbfb71ad1b185ab26c003191594b34edd4
 EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed
 EBUILD qemu-kvm-0.12.1.1.ebuild 6650 RMD160 86561dc43d60ede309596cae7eeb99b49cead334 SHA1 2673927547239ee97de90b2432c8369ebc861c22 SHA256 1c609b9a03134c80976b22b36e15d1be368e9d0acef1497c8eef2f5136e473a2
@@ -18,13 +19,14 @@ EBUILD qemu-kvm-0.12.1.ebuild 6576 RMD160 30630cd1c0148fa2f5f324ce267b80c8335d39
 EBUILD qemu-kvm-0.12.2-r1.ebuild 6705 RMD160 9861eb69394ed00cfa6f06519f381e6d2921c081 SHA1 0706a6118b17b7a3b22c60ae6bcb86d950a411c2 SHA256 e54c74d3024d0c6288a23c7530907a7a691d9716bf1ea531164d610c450b30f3
 EBUILD qemu-kvm-0.12.2-r2.ebuild 6839 RMD160 a9ace9aa4478ce9ed74fa61c0cecb80d0f22611a SHA1 8904c62ce54d589d9b8d817da793ddc559f2cb5c SHA256 cb39e309822fe468b362b316ad05428f7038b0c56a61a6da14334eca21f7ea8d
 EBUILD qemu-kvm-0.12.2.ebuild 6648 RMD160 333447896ae44355399f39b23e32ef2138a46741 SHA1 bac4ff49097b10afac1448d5939c5aa11e5b6567 SHA256 bdd45631910028f65be2664cf19572a78f9671504809d73f2760c52c23a44a1b
-EBUILD qemu-kvm-9999.ebuild 6780 RMD160 7f71060bcad8acedc94b276f081b7cad03ecb233 SHA1 f6ec5d887eb2929a9cea8d1abc01f5cf2d1855d5 SHA256 6a26f95def2bf3639dd001c3cc04a5d77a97d3f1e213ee07ae305b0b4e4f3446
-MISC ChangeLog 4021 RMD160 0a8e0f9e651cc3372a7ba69d4958b6276e98a951 SHA1 ce841c93f8ed9b4745d1d83502d1120798968e26 SHA256 5afb798a4b71d0c30ce2c3957c301fa71a738450dab1d8e12723e7bf2264561f
-MISC metadata.xml 875 RMD160 b6e13e707e44cca041e3b7aee9d72549fa7213dd SHA1 8c93960e7dcaa70f1f55e232da369198cc3a0884 SHA256 c3722e9d38f5be2b2a107d8355dd3e16d86e127376edee9b8154716c28dd1592
+EBUILD qemu-kvm-0.12.3.ebuild 6837 RMD160 40424585af908c62a46f331f7af75624247f9108 SHA1 2393e010d31cca98046b845ae4e4b636de640f8f SHA256 84a47c6ce72de72688e2de5f4771c5a589936648195b4fc5c82f75d2b7fd97cb
+EBUILD qemu-kvm-9999.ebuild 6835 RMD160 4f00534058c3abffb099032c54a27594b8017886 SHA1 3dc8a2b8339fc3ec5cd117b165beee07345f6b4d SHA256 597191c77c46853d593db212c59ca0244387dc4d0a80f55dcb236418401ac01f
+MISC ChangeLog 4214 RMD160 59f22e911fbe2804713f6b65fa477c56342de785 SHA1 1b5e0400c76b737e771b803a09083c718a9032f6 SHA256 5556b0d247ae54bc96d2a988154b6a564aad0565249b5f372bb02cb2f139e31b
+MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt5ePcACgkQoeSe8B0zEfwb9QCeNsCyOGjwhA6qSY/moDUJneEe
-cvcAn2SJNfwbWiH0bEK1gaygJGcfkJrv
-=HlTZ
+iEYEARECAAYFAkuNQ00ACgkQoeSe8B0zEfyGvwCfUV4/CoQ1gDTdoqo6wHUUPM9Z
+pGQAnjivpjO9p5xv9n64IEwvTAhOmJMS
+=Ivr5
 -----END PGP SIGNATURE-----
index 18650011fb3494ca513330e97fb92f337b5e02f3..419ef34c4dbc8bf0b99d79b5b42ef90634ce7997 100644 (file)
@@ -11,6 +11,8 @@
                <flag name='kvm-trace'>Allows you to use KVM tracing</flag>
                <flag name='ncurses'>Enable the ncurses-based console</flag>
                <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
+               <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's
+                       built in bridging</flag>
                <flag name='sdl'>Enable the SDL-based console</flag>
                <flag name='vde'>Enable VDE-based networking</flag>
                <flag name='xen'>Enables support for Xen backends</flag>
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild
new file mode 100644 (file)
index 0000000..1a6a053
--- /dev/null
@@ -0,0 +1,221 @@
+# Copyright 1999-2010 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.12.3.ebuild,v 1.1 2010/03/02 16:56:34 cardoe Exp $
+
+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
+
+if [[ ${PV} = *9999* ]]; then
+       SRC_URI=""
+       KEYWORDS=""
+else
+       SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
+       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 curl esd gnutls fdt hardened kvm-trace ncurses \
+pulseaudio qemu-ifup sasl sdl static vde"
+
+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"
+
+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}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+       !app-emulation/kqemu
+       !app-emulation/qemu
+       !app-emulation/qemu-softmmu
+       !app-emulation/qemu-user
+       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 )
+       curl? ( net-misc/curl )
+       esd? ( media-sound/esound )
+       fdt? ( sys-apps/dtc )
+       gnutls? ( net-libs/gnutls )
+       ncurses? ( sys-libs/ncurses )
+       pulseaudio? ( media-sound/pulseaudio )
+       qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+       sasl? ( dev-libs/cyrus-sasl )
+       sdl? ( >=media-libs/libsdl-1.2.11[X] )
+       vde? ( net-misc/vde )
+"
+
+DEPEND="${RDEPEND}
+       app-text/texi2html
+       >=sys-kernel/linux-headers-2.6.29
+       gnutls? ( dev-util/pkgconfig )"
+
+kvm_kern_war() {
+       eerror "Please enable KVM support in your kernel, found at:"
+       eerror
+       eerror "  Virtualization"
+       eerror "    Kernel-based Virtual Machine (KVM) support"
+       eerror
+}
+
+pkg_setup() {
+       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"
+               die "qemu-kvm version not compatible"
+       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
+       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
+
+       epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+}
+
+src_configure() {
+       local conf_opts audio_opts 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
+
+       if [ ! -z "${softmmu_targets}" ]; then
+               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"
+
+       #config options
+       conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+       use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+       conf_opts="${conf_opts} $(use_enable curl)"
+       use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
+       conf_opts="${conf_opts} $(use_enable fdt)"
+       use hardened && conf_opts="${conf_opts} --enable-user-pie"
+       use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
+       use ncurses || conf_opts="${conf_opts} --disable-curses"
+       use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
+       use sdl || conf_opts="${conf_opts} --disable-sdl"
+       use vde || conf_opts="${conf_opts} --disable-vde"
+#      conf_opts="${conf_opts} $(use_enable xen)"
+       conf_opts="${conf_opts} --disable-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 \
+               --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"
+
+       insinto /etc/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
+
+       dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+       newdoc pc-bios/README README.pc-bios || die
+       dohtml qemu-doc.html qemu-tech.html || die
+
+       dobin "${FILESDIR}"/qemu-kvm
+       dosym /usr/bin/qemu-kvm /usr/bin/kvm
+}
+
+pkg_postinst() {
+       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."
+       echo
+}
index c88426a762a8b7fefd3164702ffd3a5776743623..43f487cacce25bd7c0132f5e0a57423a7d3fa282 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.3 2010/02/15 16:40:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.4 2010/03/02 16:56:34 cardoe Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl sdl static vde"
+pulseaudio qemu-ifup sasl sdl static vde"
 
 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"
@@ -47,8 +47,6 @@ RDEPEND="
        !app-emulation/qemu
        !app-emulation/qemu-softmmu
        !app-emulation/qemu-user
-       net-misc/bridge-utils
-       sys-apps/iproute2
        sys-apps/pciutils
        >=sys-apps/util-linux-2.16.0
        sys-libs/zlib
@@ -61,6 +59,7 @@ RDEPEND="
        gnutls? ( net-libs/gnutls )
        ncurses? ( sys-libs/ncurses )
        pulseaudio? ( media-sound/pulseaudio )
+       qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
        sasl? ( dev-libs/cyrus-sasl )
        sdl? ( >=media-libs/libsdl-1.2.11[X] )
        vde? ( net-misc/vde )
@@ -188,9 +187,11 @@ src_install() {
        insinto /etc/udev/rules.d/
        doins kvm/scripts/65-kvm.rules || die
 
-       insinto /etc/qemu/
-       insopts -m0755
-       doins kvm/scripts/qemu-ifup || die
+       if use qemu-ifup; then
+               insinto /etc/qemu/
+               insopts -m0755
+               doins kvm/scripts/qemu-ifup || die
+       fi
 
        dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
        newdoc pc-bios/README README.pc-bios || die