summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kuznetsov <vadimk@gentoo.org>2013-01-07 15:46:50 -0500
committerVadim Kuznetsov <vadimk@gentoo.org>2013-01-07 15:46:50 -0500
commit12df2d70252f140bd700c04a3ad7a795c8ceb02e (patch)
tree7211cb4e7e0b772e8b06898c7e3cc004c73c149f /app-emulation/vmware-modules
parentapply patch to kernel gte 3.7.0 (diff)
downloadvmware-12df2d70252f140bd700c04a3ad7a795c8ceb02e.tar.gz
vmware-12df2d70252f140bd700c04a3ad7a795c8ceb02e.tar.bz2
vmware-12df2d70252f140bd700c04a3ad7a795c8ceb02e.zip
vmware desktop 8.0.5 version bump
Diffstat (limited to 'app-emulation/vmware-modules')
-rw-r--r--app-emulation/vmware-modules/files/264-putname.patch13
-rw-r--r--app-emulation/vmware-modules/vmware-modules-264.5.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-264.4.ebuild)7
-rw-r--r--app-emulation/vmware-modules/vmware-modules-271.0.ebuild79
3 files changed, 16 insertions, 83 deletions
diff --git a/app-emulation/vmware-modules/files/264-putname.patch b/app-emulation/vmware-modules/files/264-putname.patch
new file mode 100644
index 0000000..6e76130
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-putname.patch
@@ -0,0 +1,13 @@
+diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/vmblock-only/linux/control.c
++++ b/vmblock-only/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name
+
+ retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+
+- putname(name);
++ __putname(name);
+
+ return retval;
+ }
diff --git a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
index 64f5d39..c8daa43 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
+# $Header: $
EAPI="4"
@@ -63,10 +63,9 @@ src_prepare() {
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
use pax_kernel && epatch "${FILESDIR}/hardened.patch"
epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
+ kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
}
src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
deleted file mode 100644
index 5383e5c..0000000
--- a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- || ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
- =app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
- CONFIG_CHECK="${CONFIG_CHECK} BKL"
- fi
-
- linux-info_pkg_setup
-
- linux-mod_pkg_setup
-
- VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
- VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
- VMWARE_MOD_DIR="${PN}-${PVR}"
-
- BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
- enewgroup "${VMWARE_GROUP}"
- filter-flags -mfpmath=sse
-
- for mod in ${VMWARE_MODULE_LIST}; do
- MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
- done
-}
-
-src_unpack() {
- cd "${S}"
- for mod in ${VMWARE_MODULE_LIST}; do
- tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
- done
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-vmmon.patch"
- use pax_kernel && epatch "${FILESDIR}/hardened.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-}
-
-src_install() {
- linux-mod_src_install
- local udevrules="${T}/60-vmware.rules"
- cat > "${udevrules}" <<-EOF
- KERNEL=="vmci", GROUP="vmware", MODE=660
- KERNEL=="vmmon", GROUP="vmware", MODE=660
- KERNEL=="vsock", GROUP="vmware", MODE=660
- EOF
- udev_dorules "${udevrules}"
-}