Version bump to kvm-37.

svn path=/trunk/; revision=35

4 files changed, 143 insertions, 7 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 1573393..fb5bdee 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: $
 
+  10 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-37.ebuild:
+  Version bump to kvm-37.
+
   22 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> +files/kvm-kvm.patch,
   +files/qemu-configure.patch, +files/qemu-vl.c.patch,
   +files/scripts-qemu-ifup.patch, +metadata.xml, kvm-33.ebuild,
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 87ba40a..586e8d4 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -32,6 +32,7 @@ SHA256 09e519488c0aa9b2ea6001d46c51ca3058e35409299bc13e79c9cb7cdac6e532 files/sc
 DIST kvm-33.tar.gz 2250014 RMD160 724a87ac61f7b5a1ac8d9f43c700fa55d0fc5d8f SHA1 699e6bcdf52840f7779f4836b3a42549b5a123ec SHA256 b9ed69b2416ec1d7dd0d4d66092eb3f259329771ca3da75e3e0dc101ca83c24c
 DIST kvm-35.tar.gz 2285167 RMD160 9770d3654e339c7ae5fd67c51d9edd8fc44e94e1 SHA1 5e20b856915091c2eb9da2adf47ef95cf6346e8b SHA256 08cc019b019289b08fca445d19b5a79b2372fe1e728acd718a15c5b37c7c0ba3
 DIST kvm-36.tar.gz 2562588 RMD160 b6cd150ffa0aae075bcd80571ec359c7ee8c685c SHA1 173cc293835bec231271542e4abd80252b5c014a SHA256 5e8125ff0c77908eb566f1a1c535646a53ff4865305da2d0348d7af9b91d7680
+DIST kvm-37.tar.gz 2678709 RMD160 71d916ead7c0aa9f386ea53cb6b807ceba9aa800 SHA1 306fde7e4f8e80d5ebd69eaf26732aa7119aab09 SHA256 de9e80c69ddf58a33b1a080c301f3ade37d2eea8472a3b09182f01566fe455a8
 EBUILD kvm-33.ebuild 2123 RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 SHA1 0a7479974fbb1a78d2555282bb2cd0a4dd6365eb SHA256 6dfeb6b87f64159722f5f8dbe145f157f399758e5aafe9f10bdd1ad35ebfd11d
 MD5 6a3e06972a864b566ce7beeb5a8826a5 kvm-33.ebuild 2123
 RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 kvm-33.ebuild 2123
@@ -44,10 +45,14 @@ EBUILD kvm-36-r1.ebuild 3737 RMD160 6a379f0428878be6333a6bbae55548306d9cc1df SHA
 MD5 6398f55119a67f01cde3e55ea64d4887 kvm-36-r1.ebuild 3737
 RMD160 6a379f0428878be6333a6bbae55548306d9cc1df kvm-36-r1.ebuild 3737
 SHA256 9bd98d353c8aa6b7e93a84f7d14a42fb5885ce148d673115f338f59f59205cc7 kvm-36-r1.ebuild 3737
-MISC ChangeLog 680 RMD160 5010390a1444697b809d1528fbb52a135e570dd0 SHA1 7d25cb8ce231eda27985417416d1a94f612c4746 SHA256 74472f62cecbe89ec2656a666bf1224d64b85e144772ab918e104f542421ef46
-MD5 23188e2cda026a5bfc65e8beba1cc38f ChangeLog 680
-RMD160 5010390a1444697b809d1528fbb52a135e570dd0 ChangeLog 680
-SHA256 74472f62cecbe89ec2656a666bf1224d64b85e144772ab918e104f542421ef46 ChangeLog 680
+EBUILD kvm-37.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a437cceca6f603e47883745ed3a016f2d6dbaff1 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e
+MD5 26e3fb7d8265357601478499fee41b8c kvm-37.ebuild 3765
+RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-37.ebuild 3765
+SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e kvm-37.ebuild 3765
+MISC ChangeLog 778 RMD160 7f2496c9766bc9d3ea1580653e84a3fbe0d8e9c1 SHA1 092b278ac130a10d89efe8ba9aee5c17e73b24cf SHA256 cea9ca291d55c376af2b2ffff1c6d6ea325fdf490053211993c514ebd4b9e896
+MD5 d9b36e011c1f6df2f9be8def89f784a7 ChangeLog 778
+RMD160 7f2496c9766bc9d3ea1580653e84a3fbe0d8e9c1 ChangeLog 778
+SHA256 cea9ca291d55c376af2b2ffff1c6d6ea325fdf490053211993c514ebd4b9e896 ChangeLog 778
 MISC metadata.xml 413 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f SHA1 c14660bd6d54594bef13c86f243308fc92687eb0 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988
 MD5 5c1d1436d6cc39b3b6bf03f9d4b611ec metadata.xml 413
 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f metadata.xml 413
@@ -61,10 +66,13 @@ SHA256 a7a7565ddec84a9ebe3f989ea56ef81159b0a414c68fc5c9aaf24148c7b42457 files/di
 MD5 2771a4b4b83a0701984a6690fc5e0b10 files/digest-kvm-36-r1 223
 RMD160 328cdebc94ca3e7aa898b3d0b261e75d96da6be2 files/digest-kvm-36-r1 223
 SHA256 fe5c3e109884a1d9c4327e864486c03e075c2bdb00562606d8e8f4c922718147 files/digest-kvm-36-r1 223
+MD5 7ce124381ae59d30ec6873b357a6fc22 files/digest-kvm-37 223
+RMD160 2fa7f480b1129b38e30bd02f0ea93010f02999e3 files/digest-kvm-37 223
+SHA256 8686d44d82b61436f315b0129690badc6ffba7876989bba7837a6bb8c7aa8a1c files/digest-kvm-37 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGzLYSCkvF58q80IkRAucqAJwPAT/fww10vBWlbXMBnknViZfXRgCfV21Q
-TvbXFuGaEr7c0CWh5ob9J+8=
-=kO68
+iD8DBQFG5NHJCkvF58q80IkRAklNAJ4iT9AUcdBi7fJp7vvZ1G2TUvqPpQCfeCbT
+sqs/LWBAlUbIg9h5w/vR+Ug=
+=9EvD
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/files/digest-kvm-37 b/app-emulation/kvm/files/digest-kvm-37
new file mode 100644
index 0000000..2c8a9ed
--- /dev/null
+++ b/app-emulation/kvm/files/digest-kvm-37
@@ -0,0 +1,3 @@
+MD5 d6dfad68bc81fed9555c1a1b13dd58e9 kvm-37.tar.gz 2678709
+RMD160 71d916ead7c0aa9f386ea53cb6b807ceba9aa800 kvm-37.tar.gz 2678709
+SHA256 de9e80c69ddf58a33b1a080c301f3ade37d2eea8472a3b09182f01566fe455a8 kvm-37.tar.gz 2678709
diff --git a/app-emulation/kvm/kvm-37.ebuild b/app-emulation/kvm/kvm-37.ebuild
new file mode 100644
index 0000000..792b7c4
--- /dev/null
+++ b/app-emulation/kvm/kvm-37.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"
+}