summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kuznetsov <vadimk@gentoo.org>2010-05-03 16:53:39 +0000
committerVadim Kuznetsov <vadimk@gentoo.org>2010-05-03 16:53:39 +0000
commit740edc2c5c1472eeee1caba02375ea07bb4e6b12 (patch)
tree1f63f584086f84bdd42e7478b28c12356364e887 /app-emulation/vmware-modules
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-740edc2c5c1472eeee1caba02375ea07bb4e6b12.tar.gz
gentoo-2-740edc2c5c1472eeee1caba02375ea07bb4e6b12.tar.bz2
gentoo-2-740edc2c5c1472eeee1caba02375ea07bb4e6b12.zip
Bugs 274529, 317583
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vmware-modules')
-rw-r--r--app-emulation/vmware-modules/ChangeLog8
-rw-r--r--app-emulation/vmware-modules/files/apic.patch12
-rw-r--r--app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild3
-rw-r--r--app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild3
4 files changed, 23 insertions, 3 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 2ccef8206b58..c88f5cbe2504 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/vmware-modules
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.56 2010/02/28 17:51:15 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.57 2010/05/03 16:53:39 vadimk Exp $
+
+ 03 May 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+ vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
+ +files/apic.patch:
+ Bugs 274529, 317583
+ Thanks to Mikhail Zolotaryov for the patch.
*vmware-modules-1.0.0.26 (28 Feb 2010)
diff --git a/app-emulation/vmware-modules/files/apic.patch b/app-emulation/vmware-modules/files/apic.patch
new file mode 100644
index 000000000000..107da28ed976
--- /dev/null
+++ b/app-emulation/vmware-modules/files/apic.patch
@@ -0,0 +1,12 @@
+--- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200
++++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200
+@@ -78,6 +78,8 @@
+ #include "vmmonInt.h"
+ #include "versioned_atomic.h"
+
++#include <asm/apic.h>
++
+ #define UPTIME_FREQ CONST64(1000000)
+
+ static struct {
+
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
index dbfab6d5b83e..d14da828ccb5 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
@@ -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/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.2 2010/02/26 14:54:32 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.3 2010/05/03 16:53:39 vadimk Exp $
EAPI="2"
@@ -60,6 +60,7 @@ src_prepare() {
epatch "${FILESDIR}/${PV}-makefile-include.patch"
epatch "${FILESDIR}/sched_h-2.6.32.patch"
epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
+ epatch "${FILESDIR}/apic.patch"
}
src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
index ac6194f549dd..3c3e6235b511 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
@@ -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/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.1 2010/02/28 17:51:15 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.2 2010/05/03 16:53:39 vadimk Exp $
EAPI="2"
@@ -58,6 +58,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
epatch "${FILESDIR}/${PV}-makefile-include.patch"
+ epatch "${FILESDIR}/apic.patch"
}
src_install() {