diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2009-07-27 13:57:06 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2009-07-27 13:57:06 +0000 |
commit | 4568f9a2c6aca6404f96a06af022839e981b8ec6 (patch) | |
tree | cc74e6d154e77431f1d896d2ef373b82275bab1d /app-emulation | |
parent | Marked 1.2.30 & 1.3.8 stable on AMD64 as requested by Robert Buchholz <rbu@ge... (diff) | |
download | gentoo-2-4568f9a2c6aca6404f96a06af022839e981b8ec6.tar.gz gentoo-2-4568f9a2c6aca6404f96a06af022839e981b8ec6.tar.bz2 gentoo-2-4568f9a2c6aca6404f96a06af022839e981b8ec6.zip |
Fix kvm-kmod for 2.6.30; bug #278804
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/kvm-kmod/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch | 12 | ||||
-rw-r--r-- | app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild (renamed from app-emulation/kvm-kmod/kvm-kmod-88.ebuild) | 6 |
3 files changed, 25 insertions, 2 deletions
diff --git a/app-emulation/kvm-kmod/ChangeLog b/app-emulation/kvm-kmod/ChangeLog index 1fa9264b6dd3..d5a0298251ca 100644 --- a/app-emulation/kvm-kmod/ChangeLog +++ b/app-emulation/kvm-kmod/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/kvm-kmod # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/ChangeLog,v 1.3 2009/07/21 18:26:11 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/ChangeLog,v 1.4 2009/07/27 13:57:06 dang Exp $ + +*kvm-kmod-88-r1 (27 Jul 2009) + + 27 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> -kvm-kmod-88.ebuild, + +kvm-kmod-88-r1.ebuild, +files/kvm-kmod-devel-88-2.6.30.patch: + Fix kvm-kmod for 2.6.30; bug #278804 + *kvm-kmod-88 (21 Jul 2009) diff --git a/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch b/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch new file mode 100644 index 000000000000..0dbfa87dcbae --- /dev/null +++ b/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-kmod-devel-88.orig/external-module-compat-comm.h kvm-kmod-devel-88/external-module-compat-comm.h +--- kvm-kmod-devel-88.orig/external-module-compat-comm.h 2009-07-12 09:19:45.000000000 -0400 ++++ kvm-kmod-devel-88/external-module-compat-comm.h 2009-07-27 09:53:10.153459004 -0400 +@@ -845,7 +845,7 @@ static inline struct file *eventfd_fget( + + #include <linux/tracepoint.h> + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) + + struct tracepoint; + diff --git a/app-emulation/kvm-kmod/kvm-kmod-88.ebuild b/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild index c5f4a910fc0f..66272b9a3cf6 100644 --- a/app-emulation/kvm-kmod/kvm-kmod-88.ebuild +++ b/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-88.ebuild,v 1.1 2009/07/21 18:26:11 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild,v 1.1 2009/07/27 13:57:06 dang Exp $ EAPI="2" @@ -44,6 +44,10 @@ pkg_setup() { linux-mod_pkg_setup } +src_prepare() { + epatch "${FILESDIR}"/${MY_P}-2.6.30.patch +} + src_configure() { local conf_opts |