Version bump to kvm-42.

svn path=/trunk/; revision=38

4 files changed, 143 insertions, 7 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index f214a80..9867df5 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-42.ebuild:
+  Version bump to kvm-42.
+
   16 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-40.ebuild:
   Version bump to kvm-40.
 
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index a35d5f7..3ed85dc 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -20,6 +20,7 @@ SHA256 09e519488c0aa9b2ea6001d46c51ca3058e35409299bc13e79c9cb7cdac6e532 files/sc
 DIST kvm-37.tar.gz 2678709 RMD160 71d916ead7c0aa9f386ea53cb6b807ceba9aa800 SHA1 306fde7e4f8e80d5ebd69eaf26732aa7119aab09 SHA256 de9e80c69ddf58a33b1a080c301f3ade37d2eea8472a3b09182f01566fe455a8
 DIST kvm-39.tar.gz 3065442 RMD160 97123332cd5532708a659ffbbb201f8cbbb53677 SHA1 bae806a81b8fdb8b476d13d1e7cbeaef47f14fe1 SHA256 c3e57e15229bf94f0847bd71551e0d4ab01450676ae32f4a4fa28f36f911c156
 DIST kvm-40.tar.gz 2559228 RMD160 a77147923102cbe7fef2b455f05895f9d3b98693 SHA1 00d33d9c448787631e845a372c47612f3c59864d SHA256 8a367fd870ae68f48386b8ba5d5b673b5f8142bc7d87439cef9a5b282ce4dbbc
+DIST kvm-42.tar.gz 2569694 RMD160 022da1dda48a3ec6e8dabfffd9e88fc4b4281137 SHA1 d117d982935fc4753ed20c6ae92ce7dce219077b SHA256 43506e807d72571e6761e7ba2692ef0d71c0f35fb7ea20b8020c6ac426cccbe8
 EBUILD kvm-37.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a437cceca6f603e47883745ed3a016f2d6dbaff1 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e
 MD5 26e3fb7d8265357601478499fee41b8c kvm-37.ebuild 3765
 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-37.ebuild 3765
@@ -32,10 +33,14 @@ EBUILD kvm-40.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a
 MD5 26e3fb7d8265357601478499fee41b8c kvm-40.ebuild 3765
 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-40.ebuild 3765
 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e kvm-40.ebuild 3765
-MISC ChangeLog 1189 RMD160 355083d1ecb9b67ae8359b861f6e7e824123cee8 SHA1 9d1bf400174e301e42446eed1918529d074e40e6 SHA256 3c07b661e7d88d44063441a216668cb45ea73ca8fc77ba54eec78e45f9e35fc7
-MD5 c9cbe9165548f4f38635664e14b8eb84 ChangeLog 1189
-RMD160 355083d1ecb9b67ae8359b861f6e7e824123cee8 ChangeLog 1189
-SHA256 3c07b661e7d88d44063441a216668cb45ea73ca8fc77ba54eec78e45f9e35fc7 ChangeLog 1189
+EBUILD kvm-42.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a437cceca6f603e47883745ed3a016f2d6dbaff1 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e
+MD5 26e3fb7d8265357601478499fee41b8c kvm-42.ebuild 3765
+RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-42.ebuild 3765
+SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e kvm-42.ebuild 3765
+MISC ChangeLog 1287 RMD160 1f2a320e5f90f778a08faab250df8d3ed05d0e89 SHA1 f1193c65482f21711c62d344c56774d5deb0eff5 SHA256 43f95519b7f84faca27990ed9d748c431316338b82ab31638d15eda6dab23108
+MD5 c774cb0bcbc635e41ba877ca4c66f18a ChangeLog 1287
+RMD160 1f2a320e5f90f778a08faab250df8d3ed05d0e89 ChangeLog 1287
+SHA256 43f95519b7f84faca27990ed9d748c431316338b82ab31638d15eda6dab23108 ChangeLog 1287
 MISC metadata.xml 413 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f SHA1 c14660bd6d54594bef13c86f243308fc92687eb0 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988
 MD5 5c1d1436d6cc39b3b6bf03f9d4b611ec metadata.xml 413
 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f metadata.xml 413
@@ -49,10 +54,13 @@ SHA256 6c1d6fb06d80f0d972f18a24f384d352357dfd09d2d61f2bfb233522a83a0d14 files/di
 MD5 bdec212228261cb8cb10e8e68ca3d255 files/digest-kvm-40 223
 RMD160 65435308040733695b8fbf75c856f58c41c40014 files/digest-kvm-40 223
 SHA256 86a4ce2cc97f780a7ca3e77a49fb096bcb8fe04b2773343417af566285ddd19f files/digest-kvm-40 223
+MD5 06219b68e5cb560de3f51f53bdb70557 files/digest-kvm-42 223
+RMD160 7a445893db38779e03e4a0483a1c4953fd7a1f42 files/digest-kvm-42 223
+SHA256 a9a190c593a29a5776a0063ca4e7e805ed79545cac9933a8f78c006252daa59e files/digest-kvm-42 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG7V1uCkvF58q80IkRAiAbAJ0Ryq6QECshW88Wqo2PaMX0fOIKOgCggNq3
-jw9TzOLkCLu/Nmd/TGf7bxs=
-=JuDh
+iD8DBQFG808sCkvF58q80IkRAiJTAKCQjiipd7JOM2EKfuDrCR2JCXAwvQCggSEH
+UHU2CXdxYnawnGaP+8kbkz4=
+=fGBX
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/files/digest-kvm-42 b/app-emulation/kvm/files/digest-kvm-42
new file mode 100644
index 0000000..bcd4948
--- /dev/null
+++ b/app-emulation/kvm/files/digest-kvm-42
@@ -0,0 +1,3 @@
+MD5 62926a7e9981510cdca8a321b830c30e kvm-42.tar.gz 2569694
+RMD160 022da1dda48a3ec6e8dabfffd9e88fc4b4281137 kvm-42.tar.gz 2569694
+SHA256 43506e807d72571e6761e7ba2692ef0d71c0f35fb7ea20b8020c6ac426cccbe8 kvm-42.tar.gz 2569694
diff --git a/app-emulation/kvm/kvm-42.ebuild b/app-emulation/kvm/kvm-42.ebuild
new file mode 100644
index 0000000..792b7c4
--- /dev/null
+++ b/app-emulation/kvm/kvm-42.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit linux-mod eutils
+
+DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)"
+HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=media-libs/libsdl-1.2.11
+		>=media-libs/alsa-lib-1.0.13
+		app-text/texi2html
+		!app-emulation/qemu
+		dev-lang/python
+		>=sys-fs/e2fsprogs-1.39"
+RDEPEND="${DEPEND}
+		sys-apps/usermode-utilities"
+
+RESTRICT="strip"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="kvm(extra:"${S}"/kernel:"${S}"/kernel)
+			kvm-intel(extra:"${S}"/kernel:"${S}"/kernel)
+			kvm-amd(extra:"${S}"/kernel:"${S}"/kernel)"
+
+QA_TEXTRELS="usr/bin/qemu
+	usr/bin/qemu-system-sparc
+	usr/bin/qemu-system-arm
+	usr/bin/qemu-system-ppc
+	usr/bin/qemu-system-mips
+	usr/bin/qemu-system-x86_64"
+QA_EXECSTACK="usr/share/kvm/openbios-sparc32"
+QA_WX_LOAD="usr/share/kvm/openbios-sparc32"
+
+src_unpack() {
+	# Don't continue if the KVM modules that come with the kernel are compiled
+	if linux_chkconfig_present KVM ; then
+		eerror "${P} doesn't work with the kernel modules"
+		die "${PN} module is included in the kernel"
+	fi
+	unpack ${A}
+	cd "${S}"
+
+	# Change script to change some options.
+	epatch "${FILESDIR}/kvm-kvm.patch"
+	# Improve the ifup script to allow for non-root use, etc.
+	epatch "${FILESDIR}/scripts-qemu-ifup.patch"
+	# Change the path to the network stuff to /etc/kvm
+	epatch "${FILESDIR}/qemu-vl.c.patch"
+	# Change the DATADIR to kvm instead of qemu
+	epatch "${FILESDIR}/qemu-configure.patch"
+}
+
+src_compile() {
+	# fix make install to not install modules
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
+
+	# The included qemu is not intended to run without kvm. Thus, we can use
+	# gcc4 as well and disable the gcc-check for gcc3.
+	conf_opts="--prefix=/usr --disable-gcc-check --qemu-cc=gcc"
+
+	linux-mod_pkg_setup
+
+	# Non-standard configure script. So econf doesn't work here.
+	./configure ${conf_opts} || die "Configure failed"
+
+	linux-mod_src_compile
+
+	emake user qemu || die "make failed"
+}
+
+src_install() {
+	# fix make install to not install modules
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
+
+	emake DESTDIR="${D}" install || die "make install failed"
+	linux-mod_src_install
+
+	exeinto /usr/bin/
+	doexe "${S}/kvm" "${S}/kvm_stat"
+
+	mv "${D}/usr/share/doc/qemu" "${D}/usr/share/doc/kvm"
+	mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1"
+
+	insinto /etc/udev/rules.d/
+	doins "${WORKDIR}/${P}/scripts/65-kvm.rules"
+
+	insinto /etc/kvm/
+	insopts -m0755
+	doins "${WORKDIR}/${P}/scripts/qemu-ifup"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	enewgroup kvm
+
+	elog "Make sure you have the kernel	module loaded before running kvm."
+	elog "The easiest way to ensure that the kernel module is loaded is to load it"
+	elog "on boot."
+	elog "For AMD CPUs:"
+	elog "echo kvm-amd >> /etc/modules.autoload.d/kernel-2.6"
+	elog "For Intel CPUs:"
+	elog "echo kvm-intel >> /etc/modules.autoload.d/kernel-2.6"
+	echo
+	elog "Make sure your user is in the 'kvm' group"
+	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+	echo
+	elog "If qemu complains about not having a 1024 Hz timer, then run this:"
+	elog "echo dev.rtc.max-user-freq=1024 >> /etc/sysctl.conf"
+	echo
+	elog "If you want network support in the guest OS, you'll need to make"
+	elog "sure you compile in support for 802.1d Ethernet Bridging in the "
+	elog "kernel, set up a bridge network interface and make sure you"
+	elog "compile Universal TUN/TAP device driver support as a kernel module"
+	elog "and make it load on boot:"
+	elog "echo tun >> /etc/modules.autoload.d/kernel-2.6"
+}