diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2009-11-20 09:04:52 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-11-20 09:04:52 +0000 |
commit | 2d027bec55a25a674b4c84b5e3622dd5d9d2249b (patch) | |
tree | ee3ae207912f52abea4399034c888a35ab02e711 /app-emulation | |
parent | Cleanup. (diff) | |
download | historical-2d027bec55a25a674b4c84b5e3622dd5d9d2249b.tar.gz historical-2d027bec55a25a674b4c84b5e3622dd5d9d2249b.tar.bz2 historical-2d027bec55a25a674b4c84b5e3622dd5d9d2249b.zip |
Make udev happy. Fix installation of kvm_stat command, Bug #281031.
Package-Manager: portage-2.2_rc50/cvs/Linux i686
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/kvm/ChangeLog | 7 | ||||
-rw-r--r-- | app-emulation/kvm/Manifest | 11 | ||||
-rw-r--r-- | app-emulation/kvm/kvm-88-r2.ebuild | 198 |
3 files changed, 210 insertions, 6 deletions
diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog index bafd6a4d9895..a1d874395965 100644 --- a/app-emulation/kvm/ChangeLog +++ b/app-emulation/kvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/kvm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.39 2009/09/21 14:57:21 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.40 2009/11/20 09:04:52 zzam Exp $ + +*kvm-88-r2 (20 Nov 2009) + + 20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> +kvm-88-r2.ebuild: + Make udev happy. Fix installation of kvm_stat command, Bug #281031. 21 Sep 2009; Daniel Gryniewicz <dang@gentoo.org> metadata.xml: Remove myself as maintainer diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest index 7ae437115f4e..d3202924efb1 100644 --- a/app-emulation/kvm/Manifest +++ b/app-emulation/kvm/Manifest @@ -11,12 +11,13 @@ DIST qemu-kvm-devel-88.tar.gz 4364002 RMD160 654683522dc670fc8743e415b8f5b2cb32b EBUILD kvm-84.ebuild 7064 RMD160 2c15c4866c504d26aa7117ebdb5a9a9cb7b73f98 SHA1 620204d39a2a7cb1dffe7a46886304418f8f4a3a SHA256 d80adf7abc6ddb0a852ef2b6cacc84fdcb71867d3c7499ebb36993a201a69d3d EBUILD kvm-85-r2.ebuild 6541 RMD160 636e23181f330d543ce691f8c8e1db3eecf723b9 SHA1 cbeccf5a51586d1af2997850f0af93c033c0541d SHA256 10c05b411aa996fac2e85d65e543aef42914a38ea2596a8fc65af0403dd94e71 EBUILD kvm-88-r1.ebuild 6223 RMD160 a137aedeb1c07c2fc776ebe6d579de7be25f0d32 SHA1 cab550775a67b0f208d777aa021f8ab01fe3ebb9 SHA256 1f7fcc34a7530b568973bb0f3a801c30d09b634bda71008c28c860f31d174614 -MISC ChangeLog 9634 RMD160 b9f950c3f7a3532f3f7a4b27e4ffe60a306f140e SHA1 107fdf71a0c72db97a0c92e969166c6da9a03b70 SHA256 10d32d701ec700002465639131e08de158846c1195bf0474a6766eb6aeeb7ad8 +EBUILD kvm-88-r2.ebuild 6352 RMD160 8645f3cac46a6168a52d132588d3ceb81b29e828 SHA1 19eb52e2f2a465472a4cac645cf2e38bd8238cc1 SHA256 9df5782c1c657144738216c84a218ead6992cb6e479bf7f95e8fedd4870f4b3e +MISC ChangeLog 9803 RMD160 d6432a9aa2976ecac7ae616f14b329521efa437a SHA1 6f32cfb0fb711107d47ba95f3f5b0fa796d74f15 SHA256 a1e3b2b12f08c875c75417a60a7e5d52c09bdc3197b92922a13f701efe7d0048 MISC metadata.xml 1187 RMD160 97dce7cc36dbcdd33a221e120d95c765b1192565 SHA1 c4208ab8d75f1526b40a71370359c2a04858be39 SHA256 a9cc4ee203ceca4d615b2548b9de21f85339d6621711bcc94dafc02232122b61 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iD8DBQFKt5RdomPajV0RnrERAudCAJ4yZi8dkquwEIZzEpuqOoGoOz/i7ACdEZJs -GBGUzquQHWvIuP3SyiI+wEQ= -=fYY5 +iEYEARECAAYFAksGW7kACgkQt2vP6XvVdOdIXACgxiuNU6tqiI/hFruUAeLIUiMY +RkMAn0RTXPNx02ZgH/gKDdsTBVQmjDhX +=1Ek/ -----END PGP SIGNATURE----- diff --git a/app-emulation/kvm/kvm-88-r2.ebuild b/app-emulation/kvm/kvm-88-r2.ebuild new file mode 100644 index 000000000000..fae9b147102a --- /dev/null +++ b/app-emulation/kvm/kvm-88-r2.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-88-r2.ebuild,v 1.1 2009/11/20 09:04:52 zzam Exp $ + +EAPI="2" + +inherit eutils flag-o-matic toolchain-funcs linux-info + +MY_PN="qemu-${PN}-devel" +MY_P="${MY_PN}-${PV}" + +# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master +PATCHSET="kvm-patches-20090725" +SRC_URI="mirror://sourceforge/kvm/${MY_P}.tar.gz + http://dev.gentoo.org/~dang/files/${PATCHSET}.tar.gz" + +DESCRIPTION="Kernel-based Virtual Machine userland tools" +HOMEPAGE="http://www.linux-kvm.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +# Add bios back when it builds again +IUSE="alsa bluetooth esd gnutls havekernel +modules ncurses pulseaudio +sdl vde" +RESTRICT="test" + +RDEPEND="sys-libs/zlib + sys-apps/pciutils + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + esd? ( media-sound/esound ) + pulseaudio? ( media-sound/pulseaudio ) + gnutls? ( net-libs/gnutls ) + ncurses? ( sys-libs/ncurses ) + sdl? ( >=media-libs/libsdl-1.2.11[X] ) + vde? ( net-misc/vde ) + bluetooth? ( net-wireless/bluez ) + modules? ( ~app-emulation/kvm-kmod-${PV} )" + +# bios? ( +# sys-devel/dev86 +# dev-lang/perl +# sys-power/iasl +# ) +DEPEND="${RDEPEND} + gnutls? ( dev-util/pkgconfig ) + app-text/texi2html" + +QA_TEXTRELS="usr/bin/kvm" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use havekernel && use modules ; then + ewarn "You have the 'havekernel' and 'modules' use flags enabled." + ewarn "'havekernel' trumps 'modules'; the kvm modules will not" + ewarn "be built. You must ensure you have a compatible kernel" + ewarn "with the kvm modules on your own" + elif use havekernel ; then + ewarn "You have the 'havekernel' use flag set. This means you" + ewarn "must ensure you have a compatible kernel on your own." + elif use modules ; then + :; + elif 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, or enable the 'modules' USE flag." + die "kvm version not compatible" + elif ! linux_chkconfig_present KVM; then + eerror "Please enable KVM support in your kernel, found at:" + eerror + eerror " Virtualization" + eerror " Kernel-based Virtual Machine (KVM) support" + eerror + eerror "or enable the 'modules' USE flag." + die "KVM support not detected!" + fi + + enewgroup kvm +} + +src_prepare() { + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target + [[ -x /sbin/paxctl ]] && \ + sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ + Makefile.target + + # remove part to make udev happy + sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules + + # Kernel patch; doesn't apply + rm "${WORKDIR}/${PATCHSET}"/07_all_kernel-longmode.patch + # evdev patch is upstream + rm "${WORKDIR}/${PATCHSET}"/10_all_evdev_keycode_map.patch + + # apply patchset + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" + EPATCH_SUFFIX="patch" + epatch +} + +src_configure() { + local mycc conf_opts audio_opts + + audio_opts="oss" + use gnutls || conf_opts="$conf_opts --disable-vnc-tls" + use ncurses || conf_opts="$conf_opts --disable-curses" + use sdl || conf_opts="$conf_opts --disable-sdl" + use vde || conf_opts="$conf_opts --disable-vde" + use bluetooth || conf_opts="$conf_opts --disable-bluez" + 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" + conf_opts="$conf_opts --prefix=/usr" + conf_opts="$conf_opts --disable-strip" + conf_opts="$conf_opts --disable-xen" + + ./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed" +} + +src_compile() { + mycc=$(cat config-host.mak | egrep "^CC=" | cut -d "=" -f 2) + + filter-flags -fpie -fstack-protector + + # If using gentoo's compiler set the SPEC to non-hardened + if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then + local myccver=$(${mycc} -dumpversion) + local gccver=$($(tc-getBUILD_CC) -dumpversion) + + #Is this a SPEC for the right compiler version? + myspec="${GCC_SPECS/${gccver}/${myccver}}" + if [ "${myspec}" == "${GCC_SPECS}" ]; then + shopt -s extglob + GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}" + shopt -u extglob + else + unset GCC_SPECS + fi + fi + + emake || die "emake failed" +} + +src_install() { + # Fix docs manually (dynamically generated during compile) + sed -i -e 's/QEMU/KVM/g;\ + s/qemu/kvm/g;\ + s/Qemu/Kvm/g;\ + s/kvm-\([a-z\-]*\)\.texi/qemu-\1\.texi/g' \ + *.texi *.1 *.8 + + emake DESTDIR="${D}" install || die "make install failed" +ls -l "${S}/kvm/kvm_stat" + dobin "${S}/kvm/kvm_stat" || die "dobin failed" + + mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1 + mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1 + mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8 + mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img + mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd + mv "${D}"/usr/bin/qemu-io "${D}"/usr/bin/kvm-io + rm "${D}"/usr/share/kvm/openbios-{sparc32,sparc64,ppc} + + insinto /etc/udev/rules.d/ + doins kvm/scripts/65-kvm.rules + + insinto /etc/kvm/ + insopts -m0755 + newins kvm/scripts/qemu-ifup kvm-ifup + newins kvm/scripts/qemu-ifdown kvm-ifdown + + dodoc pc-bios/README + newdoc qemu-doc.html kvm-doc.html + newdoc qemu-tech.html kvm-tech.html +} + +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 +} |