[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: f0d2d07f7592531eab46fb5b86d58b29bf206d0b Author: Joshua Baergen emc com> AuthorDate: Thu Jul 6 18:23:43 2017 + Commit: Evan Teran gmail com> CommitDate: Thu Jul 6 18:23:50 2017 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f0d2d07f app-emulation/vmware-modules: add support to kernel 4.12 .../files/308-4.12-00-vmblock-current_time.patch | 11 +++ .../files/308-4.12-01-vmci-do_once.patch | 18 ++ .../files/308-4.12-02-vmci-pci_enable_msix.patch | 17 + .../vmware-modules/vmware-modules-308.5.7.ebuild | 3 +++ 4 files changed, 49 insertions(+) diff --git a/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch new file mode 100644 index 000..f39b862 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch @@ -0,0 +1,11 @@ +--- ./vmblock-only/linux/inode.c 2017-07-06 11:47:09.496190133 -0600 ./vmblock-only/linux/inode.c.new 2017-07-06 11:55:53.212410091 -0600 +@@ -156,7 +156,7 @@ +inode->i_mode = S_IFLNK | S_IRWXUGO; +inode->i_size = INODE_TO_IINFO(inode)->nameLen; +inode->i_version = 1; +- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; ++ inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) +inode->i_uid = inode->i_gid = 0; + #else diff --git a/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch new file mode 100644 index 000..e91f047 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch @@ -0,0 +1,18 @@ +--- vmci-only/shared/vm_basic_defs.h 2017-06-19 20:29:40.0 -0600 vmci-only/shared/vm_basic_defs.h.new 2017-07-06 12:11:37.146017203 -0600 +@@ -720,6 +720,7 @@ + lfMessageFont) + + /* This is not intended to be thread-safe. */ ++#ifndef DO_ONCE + #define DO_ONCE(code) \ +do { \ + static Bool _doOnceDone = FALSE; \ +@@ -728,6 +729,7 @@ + code; \ + } \ +} while (0) ++#endif + + /* + * Bug 827422 and 838523. diff --git a/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch new file mode 100644 index 000..a4ce13a --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch @@ -0,0 +1,17 @@ +--- ./vmci-only/linux/driver.c 2017-07-06 12:12:38.860458601 -0600 ./vmci-only/linux/driver.c.new 2017-07-06 12:21:09.986139888 -0600 +@@ -1726,11 +1726,11 @@ + vmci_dev.msix_entries[i].vector = i; +} + +- result = pci_enable_msix(pdev, vmci_dev.msix_entries, VMCI_MAX_INTRS); ++ result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, VMCI_MAX_INTRS); +if (!result) { + vmci_dev.exclusive_vectors = TRUE; +- } else if (result > 0) { +- result = pci_enable_msix(pdev, vmci_dev.msix_entries, 1); ++ } else { ++ result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, 1); +} +return result; + } diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild index 351dec4..ad6b45c 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild @@ -107,6 +107,9 @@ src_prepare() { kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch" kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch" kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch" + kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-00-vmblock-current_time.patch" + kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-01-vmci-do_once.patch" + kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 21f2f9477ccb35e04fefed3c0bc3d4c724ab0255 Author: Evan Teran gmail com> AuthorDate: Wed Apr 5 14:49:40 2017 + Commit: Evan Teran gmail com> CommitDate: Wed Apr 5 14:49:40 2017 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=21f2f947 adding support for 4.9 kernels to vmware-modules 304 (workstation 11) .../files/304-4.9-00-get_user_pages.patch | 20 .../files/304-4.9-01-get_user_pages.patch | 20 .../vmware-modules/vmware-modules-304.4-r1.ebuild | 125 + 3 files changed, 165 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch new file mode 100644 index 000..9b7e0a4 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch @@ -0,0 +1,20 @@ +--- vmmon-only.bak/linux/hostif.c 2017-04-05 10:10:24.522070886 -0400 vmmon-only/linux/hostif.c 2017-04-05 10:13:35.871077701 -0400 +@@ -1171,12 +1171,16 @@ HostIFGetUserPages(void *uvAddr, +int retval; + +down_read(>mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, NULL); ++#else + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99) +retval = get_user_pages((unsigned long)uvAddr, + #else +retval = get_user_pages(current, current->mm, (unsigned long)uvAddr, + #endif +numPages, 0, 0, ppages, NULL); ++#endif +up_read(>mm->mmap_sem); + +return retval != numPages; + diff --git a/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch new file mode 100644 index 000..0858beb --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch @@ -0,0 +1,20 @@ +diff -rupN vmnet-only.bak/userif.c vmnet-only/userif.c +--- vmnet-only.bak/userif.c2017-04-05 10:44:29.166143701 -0400 vmnet-only/userif.c2017-04-05 10:45:46.443146453 -0400 +@@ -113,12 +113,16 @@ UserifLockPage(VA addr) // IN +int retval; + +down_read(>mm->mmap_sem); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ retval = get_user_pages(addr, 1, FOLL_WRITE, , NULL); ++#else + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99) +retval = get_user_pages(addr, + #else +retval = get_user_pages(current, current->mm, addr, + #endif + 1, 1, 0, , NULL); ++#endif +up_read(>mm->mmap_sem); + +if (retval != 1) { diff --git a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild new file mode 100644 index 000..d50aedc --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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" +IUSE="pax_kernel +vmci +vsock" + +RDEPEND="" +DEPEND="${RDEPEND} + || ( =app-emulation/vmware-player-7.1.${PV_MINOR}* + =app-emulation/vmware-workstation-11.1.${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 + if use vmci ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI" + fi + if use vsock ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS" + fi + + linux-info_pkg_setup + + linux-mod_pkg_setup + + VMWARE_GROUP=${VMWARE_GROUP:-vmware} + + VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock" + VMWARE_MODULE_LIST="vmblock vmmon vmnet" + use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" + use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_NAM
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 44fda826a47e67573d69290ea616e6da210e9849 Author: Joshua Baergen emc com> AuthorDate: Mon Dec 12 18:11:23 2016 + Commit: Evan Teran gmail com> CommitDate: Mon Dec 12 18:19:55 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=44fda826 app-emulation/vmware-modules: add support for kernel 4.9 4.9 introduced a change to the get_user_pages() API: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=768ae309a96103ed02eb1e111e838c87854d8b51 .../files/308-4.09-00-user-pages.patch | 77 ++ .../vmware-modules/vmware-modules-308.1.1.ebuild | 1 + 2 files changed, 78 insertions(+) diff --git a/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch new file mode 100644 index 000..73c6c9f --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch @@ -0,0 +1,77 @@ +--- vmmon-only/linux/hostif.c 2016-12-12 09:17:44.438182532 -0700 vmmon-only/linux/hostif.c 2016-12-12 09:19:24.066254301 -0700 +@@ -1172,7 +1172,11 @@ + #else +retval = get_user_pages(current, current->mm, (unsigned long)uvAddr, + #endif +- numPages, 0, 0, ppages, NULL); ++ numPages, 0, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ 0, ++#endif ++ ppages, NULL); +up_read(>mm->mmap_sem); + +return retval != numPages; +--- vmnet-only/userif.c 2016-12-12 09:27:12.445246854 -0700 vmnet-only/userif.c 2016-12-12 09:27:30.654298646 -0700 +@@ -118,7 +118,13 @@ + #else +retval = get_user_pages(current, current->mm, addr, + #endif +- 1, 1, 0, , NULL); ++ 1, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ 1, 0, ++#else ++ FOLL_WRITE, ++#endif ++ , NULL); +up_read(>mm->mmap_sem); + +if (retval != 1) { +--- vmci-only/linux/driver.c2016-12-12 09:38:13.076847013 -0700 vmci-only/linux/driver.c2016-12-12 09:38:45.638087445 -0700 +@@ -1473,7 +1473,13 @@ + #else +retval = get_user_pages(current, current->mm, addr, + #endif +- 1, 1, 0, , NULL); ++ 1, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ 1, 0, ++#else ++ FOLL_WRITE, ++#endif ++ , NULL); +up_read(>mm->mmap_sem); + +if (retval != 1) { +--- vmci-only/linux/vmciKernelIf.c 2016-12-12 09:38:20.678904322 -0700 vmci-only/linux/vmciKernelIf.c 2016-12-12 09:39:59.129587451 -0700 +@@ -2061,7 +2061,11 @@ +(VA)produceUVA, + #endif +produceQ->kernelIf->numPages, +- 1, 0, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ 1, 0, ++#else ++ FOLL_WRITE, ++#endif +produceQ->kernelIf->u.h.headerPage, +NULL); +if (retval < produceQ->kernelIf->numPages) { +@@ -2079,7 +2083,11 @@ +(VA)consumeUVA, + #endif +consumeQ->kernelIf->numPages, +- 1, 0, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ++ 1, 0, ++#else ++ FOLL_WRITE, ++#endif +consumeQ->kernelIf->u.h.headerPage, +NULL); +if (retval < consumeQ->kernelIf->numPages) { diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild index b3faaaf..bb9db4f 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild @@ -105,6 +105,7 @@ src_prepare() { kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch" kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch" + kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: /
commit: c7079f181905ce7014a5e1376f07d5f0dfc1852c Author: Evan Teran gmail com> AuthorDate: Mon Dec 12 21:19:40 2016 + Commit: Evan Teran gmail com> CommitDate: Mon Dec 12 21:19:40 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c7079f18 Merge branch 'baergj-z/baergj/kernel_4.9' .../files/308-4.09-00-user-pages.patch | 77 ++ .../vmware-modules/vmware-modules-308.1.1.ebuild | 1 + 2 files changed, 78 insertions(+)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-player/files/
commit: 105e0cb607e8b71cc3b6177523ba6f1757a3f21e Author: Evan Teran gmail com> AuthorDate: Fri Sep 2 14:28:55 2016 + Commit: Evan Teran gmail com> CommitDate: Fri Sep 2 14:28:55 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=105e0cb6 switching to openrc-run from runscript app-emulation/vmware-player/files/vmware-11.2.rc | 2 +- app-emulation/vmware-player/files/vmware-12.1.rc | 2 +- app-emulation/vmware-workstation/files/vmware-11.0.rc| 2 +- app-emulation/vmware-workstation/files/vmware-11.1.rc| 2 +- app-emulation/vmware-workstation/files/vmware-11.2.rc| 2 +- app-emulation/vmware-workstation/files/vmware-12.1.rc| 2 +- app-emulation/vmware-workstation/files/vmware-9.0.rc | 2 +- app-emulation/vmware-workstation/files/vmware-server-11.0.rc | 2 +- app-emulation/vmware-workstation/files/vmware-server-11.1.rc | 2 +- app-emulation/vmware-workstation/files/vmware-server-11.2.rc | 2 +- app-emulation/vmware-workstation/files/vmware-server-12.1.rc | 2 +- app-emulation/vmware-workstation/files/vmware-server-9.0.rc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app-emulation/vmware-player/files/vmware-11.2.rc b/app-emulation/vmware-player/files/vmware-11.2.rc index f2dc692..3437207 100644 --- a/app-emulation/vmware-player/files/vmware-11.2.rc +++ b/app-emulation/vmware-player/files/vmware-11.2.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-player/files/vmware-12.1.rc b/app-emulation/vmware-player/files/vmware-12.1.rc index 2a827bc..14ff124 100644 --- a/app-emulation/vmware-player/files/vmware-12.1.rc +++ b/app-emulation/vmware-player/files/vmware-12.1.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc index f2dc692..3437207 100644 --- a/app-emulation/vmware-workstation/files/vmware-11.0.rc +++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-11.1.rc b/app-emulation/vmware-workstation/files/vmware-11.1.rc index f2dc692..3437207 100644 --- a/app-emulation/vmware-workstation/files/vmware-11.1.rc +++ b/app-emulation/vmware-workstation/files/vmware-11.1.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-11.2.rc b/app-emulation/vmware-workstation/files/vmware-11.2.rc index f2dc692..3437207 100644 --- a/app-emulation/vmware-workstation/files/vmware-11.2.rc +++ b/app-emulation/vmware-workstation/files/vmware-11.2.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-12.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc index f2dc692..3437207 100644 --- a/app-emulation/vmware-workstation/files/vmware-12.1.rc +++ b/app-emulation/vmware-workstation/files/vmware-12.1.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc index 85ae7cd..b568831 100644 --- a/app-emulation/vmware-workstation/files/vmware-9.0.rc +++ b/app-emulation/vmware-workstation/files/vmware-9.0.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc index a82b900..439949f 100644 --- a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc +++ b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.1.rc b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc index a82b900..439949f 100644 --- a/app-emulation/vmware-workstation/files/
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/, app-emulation/vmware-modules/
commit: 347b7f0eaeebba4cd5338c663113da99fdacf528 Author: Evan Teran gmail com> AuthorDate: Thu Aug 11 18:34:31 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Aug 11 18:34:31 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=347b7f0e trying to version bump vmware 11 .../vmware-modules/vmware-modules-304.4.ebuild | 122 + app-emulation/vmware-workstation/Manifest | 1 + .../vmware-workstation-11.1.4.3848939.ebuild | 549 + 3 files changed, 672 insertions(+) diff --git a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild new file mode 100644 index 000..ba97b17 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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" +IUSE="pax_kernel +vmci +vsock" + +RDEPEND="" +DEPEND="${RDEPEND} + || ( =app-emulation/vmware-player-7.1.${PV_MINOR}* + =app-emulation/vmware-workstation-11.1.${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 + if use vmci ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI" + fi + if use vsock ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS" + fi + + linux-info_pkg_setup + + linux-mod_pkg_setup + + VMWARE_GROUP=${VMWARE_GROUP:-vmware} + + VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock" + VMWARE_MODULE_LIST="vmblock vmmon vmnet" + use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" + use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_ALL}; 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" + use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch" + epatch "${FILESDIR}/${PV_MAJOR}-apic.patch" + + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch" + kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch" + kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch" + #kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch" + #kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpai
[gentoo-commits] proj/vmware:master commit in: /
commit: 4b3cedf5e9e70313aa47a003db703c1b5eb381a0 Author: Evan Teran gmail com> AuthorDate: Thu Aug 11 18:00:14 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Aug 11 18:00:14 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=4b3cedf5 Merge branch 'master' of git://git.gentoo.org/proj/vmware .../files/304-4.6-00-user-pages.patch | 84 +++ .../files/304-4.7-00-trans_start.patch | 11 ++ .../files/304-4.7-01-readlink_copy.patch | 16 +++ .../vmware-modules/files/304-hardened.patch| 62 +++ .../files/308-4.05-00-vmblock-follow_link.patch| 33 -- .../files/308-4.06-00-user-pages.patch | 84 +++ .../files/308-4.07-00-trans_start.patch| 11 ++ .../files/308-4.07-01-readlink_copy.patch | 16 +++ .../vmware-modules/vmware-modules-304.3-r1.ebuild | 3 + ...08.1.0.ebuild => vmware-modules-308.1.1.ebuild} | 3 + app-emulation/vmware-player/Manifest | 2 +- ebuild => vmware-player-12.1.1.3770994.ebuild} | 120 - app-emulation/vmware-tools/Manifest| 6 ++ ...3.ebuild => vmware-tools-10.0.6.3595377.ebuild} | 2 +- app-emulation/vmware-workstation/Manifest | 2 +- ...ld => vmware-workstation-12.1.1.3770994.ebuild} | 115 16 files changed, 364 insertions(+), 206 deletions(-) diff --cc app-emulation/vmware-tools/Manifest index c6f45e6,07cfe37..79d00b8 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@@ -4,36 -5,36 +5,41 @@@ DIST vmware-tools-freebsd-9.6.5-2700073 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40 +DIST vmware-tools-freebsd-9.9.5-3848939.x86_64.component.tar 15247360 SHA256 13ed234ff002652b4bd46b56617c4ae88211cdf4303ab9868b3204915ba7cb14 SHA512 b9061bbd9ef1411f1372a8d371863ac84e294ffa340853690759783717a1bb31ea77c272ae83d7e203aaba3a4e093231e96d477ba6a8213b28eb18920b66570e WHIRLPOOL 73849afcf5acf1071c2e4911a5e20051907e8a1b02dbf3a7fbbbd5fb0426f501323a56daf7226e6956cbc68b541d1fb65f23da3a02ba10c25455e9de285afbb3 DIST vmware-tools-linux-10.0.5-3228253.x86_64.component.tar 72038400 SHA256 bdc01737a53ec49998fa7195ed74a5beeefe9ab18ace195a8ed4d79a311351e7 SHA512 6b087a02b925e146c319f561f6e2e4b712113137672dff508f247fe1389b6022a1cc067c22bb33269f6fa97f66e1d38aed5c2c72dc3cc2a8a3f5c7b2d3b259b2 WHIRLPOOL 8c73f475a1f31fe20ae3c52dd685fb2dbe5573be702e9cd8114ca8c68d2232dbd5a678f5925a7ca47f0f4adf028ebcbe6a9adf870bf13511c4db2b9e6e039746 + DIST vmware-tools-linux-10.0.6-3595377.x86_64.component.tar 72099840 SHA256 ca24a954e6f636abdf38cc14e6d668ef0b40ba07707701c21fc88eea640a9ba1 SHA512 33c3815e1f70a663090adeb00f5a5c58d06146bca95181bdaef30dd19b09b38f8441cb1722fd882eb7c83436a963843d12d05cd57767a7b6514fd5bcc69d939a WHIRLPOOL c465dafba0e9d716d02e0795c38dfad5c163398675c886a7c60059c57114543ab04dc26e4f5af56d867dcd0cc272409fef4b391408a413feac29d06578726199 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: afca8617c93989afb0562ec2c1bc14b25a835874 Author: Evan Teran gmail com> AuthorDate: Thu Aug 11 17:59:41 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Aug 11 17:59:41 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=afca8617 adding new version of vmware-tools (hopefully) fixes windows 10 file sharing? app-emulation/vmware-tools/Manifest| 6 +++ .../vmware-tools/vmware-tools-9.9.5.3848939.ebuild | 58 ++ 2 files changed, 64 insertions(+) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index d7d40bb..c6f45e6 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -4,33 +4,39 @@ DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40 +DIST vmware-tools-freebsd-9.9.5-3848939.x86_64.component.tar 15247360 SHA256 13ed234ff002652b4bd46b56617c4ae88211cdf4303ab9868b3204915ba7cb14 SHA512 b9061bbd9ef1411f1372a8d371863ac84e294ffa340853690759783717a1bb31ea77c272ae83d7e203aaba3a4e093231e96d477ba6a8213b28eb18920b66570e WHIRLPOOL 73849afcf5acf1071c2e4911a5e20051907e8a1b02dbf3a7fbbbd5fb0426f501323a56daf7226e6956cbc68b541d1fb65f23da3a02ba10c25455e9de285afbb3 DIST vmware-tools-linux-10.0.5-3228253.x86_64.component.tar 72038400 SHA256 bdc01737a53ec49998fa7195ed74a5beeefe9ab18ace195a8ed4d79a311351e7 SHA512 6b087a02b925e146c319f561f6e2e4b712113137672dff508f247fe1389b6022a1cc067c22bb33269f6fa97f66e1d38aed5c2c72dc3cc2a8a3f5c7b2d3b259b2 WHIRLPOOL 8c73f475a1f31fe20ae3c52dd685fb2dbe5573be702e9cd8114ca8c68d2232dbd5a678f5925a7ca47f0f4adf028ebcbe6a9adf870bf13511c4db2b9e6e039746 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4 DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed266ef888c8fd9a9f0d49083767f525b03bb2725d241c048308e8660b67254 SHA512 af12a60a70727db6ff98bfcc1693eda8c78fc09f3c5769eb42cd2ddfc36b6ae411309414d922d6fbcbfddab7875822a57d1bbe4afe2e00afd6afc09c8d959d89 WHIRLPOOL b46ef6bd824758bd2c4fdf8b3934a99baa23a4c2c6b9728a9ff464363c8c31050ffbe1392470191514f50d2f1ac208092f5d789e8cde1681d317636cce87d1b3 DIST vmware-tools-linux-9.9.4-3206955.x86_64.component.tar 62085120 SHA256 d1482b6c78f5a7bf5820b174fe5fdd6f0fcaa3ed66c12eefa32e6b59358c376c SHA512 4c2b64b399a802fc1f7ef13878d0c8772507c971d5f515c6323e29a65b6d6fcb27ed48996ad5c6db0ff4d9a19db597b6d8b2eb1c3292cacd47cba9db5c65ef5f WHI
[gentoo-commits] proj/vmware:master commit in: /
commit: 59c61fd835753e756a1264f1e3172950dd9d722e Author: Evan Teran gmail com> AuthorDate: Mon Mar 21 01:36:00 2016 + Commit: Evan Teran gmail com> CommitDate: Mon Mar 21 01:36:00 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=59c61fd8 Merge branch 'master' of git://git.gentoo.org/proj/vmware app-emulation/vmware-player/Manifest | 4 +- app-emulation/vmware-player/files/vmware-10.0.rc | 37 --- app-emulation/vmware-player/files/vmware-11.1.rc | 44 .../files/{vmware-11.0.rc => vmware-12.1.rc} | 2 +- app-emulation/vmware-player/metadata.xml | 1 + .../vmware-player-12.1.0.3272444-r2.ebuild}| 272 +++-- .../vmware-player-6.0.6.2700073.ebuild | 245 --- .../vmware-player-7.1.2.2780323.ebuild | 263 app-emulation/vmware-workstation/Manifest | 1 + ...orkstation-12.1.0.3272444-unbundle-libcds.patch | Bin 3414 -> 0 bytes ...=> vmware-workstation-11.1.3.3206955-r3.ebuild} | 4 +- ...=> vmware-workstation-11.1.3.3206955-r4.ebuild} | 14 +- ...=> vmware-workstation-12.1.0.3272444-r2.ebuild} | 36 +-- 13 files changed, 69 insertions(+), 854 deletions(-)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/
commit: 249fc566682eb42f75ea4a97b1a61c6a0da4a0ba Author: Evan Teran gmail com> AuthorDate: Mon Mar 21 01:35:46 2016 + Commit: Evan Teran gmail com> CommitDate: Mon Mar 21 01:35:46 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=249fc566 app-emulation/vmware-modules: enabling a patch that makes 308.x build on 4.5 kernels :-) Package-Manager: portage-2.2.26 app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild index 98a4bd4..0412eca 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild @@ -96,10 +96,11 @@ src_prepare() { kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch" - kernel_is ge 4 01 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch" - kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch" - kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch" - kernel_is ge 4 03 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch" + kernel_is ge 4 1 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch" + kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch" + kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 1f0fe410a387b4dfeb5b8633576023135ca9ddc4 Author: Evan Teran gmail com> AuthorDate: Thu Mar 17 02:03:05 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Mar 17 02:03:05 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1f0fe410 app-emulation/vmware-modules: compiles on 4.3 kernels :-) Package-Manager: portage-2.2.26 .../files/304-4.3-00-misc_deregister.patch | 34 ++ ...304.3.ebuild => vmware-modules-304.3-r1.ebuild} | 1 + 2 files changed, 35 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch new file mode 100644 index 000..32d960d --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch @@ -0,0 +1,34 @@ +diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c +--- vmci-only/linux/driver.c 2016-03-16 21:59:30.229062702 -0400 vmci-only.new/linux/driver.c 2016-03-16 21:58:35.452061974 -0400 +@@ -2469,7 +2469,9 @@ vmci_init(void) + static void __exit + vmci_exit(void) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +int retval; ++#endif + +if (guestDeviceInit) { + pci_unregister_driver(_driver); + +diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c +--- vmci-only/linux/driver.c 2016-03-16 21:53:24.184057841 -0400 vmci-only.new/linux/driver.c 2016-03-16 21:54:37.558058816 -0400 +@@ -2482,12 +2482,16 @@ vmci_exit(void) + + VMCI_HostCleanup(); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ misc_deregister(); ++#else + retval = misc_deregister(); + if (retval) { + Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME); + } else { + Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME); + } ++#endif + + hostDeviceInit = FALSE; +} diff --git a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild similarity index 97% rename from app-emulation/vmware-modules/vmware-modules-304.3.ebuild rename to app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild index a77203d..766eb32 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild @@ -99,6 +99,7 @@ src_prepare() { kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch" kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch" kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch" + kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: df07c010bf6ed8e418d6a677dc181ae89c7b26f7 Author: Evan Teran gmail com> AuthorDate: Fri Mar 18 03:14:17 2016 + Commit: Evan Teran gmail com> CommitDate: Fri Mar 18 03:14:17 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=df07c010 app-emulation/vmware-tools: initial support for vmware-12 Package-Manager: portage-2.2.26 app-emulation/vmware-tools/Manifest| 6 +++ .../vmware-tools-10.0.5.3228253.ebuild | 58 ++ 2 files changed, 64 insertions(+) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index 7881674..d7d40bb 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -1,28 +1,34 @@ +DIST vmware-tools-freebsd-10.0.5-3228253.x86_64.component.tar 15349760 SHA256 14cc57924327bec553804cf601e561465acdd0b01299dbedc89bf0e63ea8bcee SHA512 3b7fabb26b6a0aeaa05603b8635166a1f4fad223b90e4564f6656f158a9bb47171dc023c3b83698d1cb114b0517acf82054767a99336b3e5ded1f2d702bb4e3a WHIRLPOOL bb6c808019c294861064d8b358c01e11ccad03db6b4548a5979f5680bd3cfa4b8b1227fca95a0e6756af4626b428e377aae04cc190f6280751a8a5585ccb5edf DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdf455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40 +DIST vmware-tools-linux-10.0.5-3228253.x86_64.component.tar 72038400 SHA256 bdc01737a53ec49998fa7195ed74a5beeefe9ab18ace195a8ed4d79a311351e7 SHA512 6b087a02b925e146c319f561f6e2e4b712113137672dff508f247fe1389b6022a1cc067c22bb33269f6fa97f66e1d38aed5c2c72dc3cc2a8a3f5c7b2d3b259b2 WHIRLPOOL 8c73f475a1f31fe20ae3c52dd685fb2dbe5573be702e9cd8114ca8c68d2232dbd5a678f5925a7ca47f0f4adf028ebcbe6a9adf870bf13511c4db2b9e6e039746 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4 DIST
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-tools/, ...
commit: 3e3c6c36f8f3c88fdb3fa4c6bcd47c74b44fa105 Author: Evan Teran gmail com> AuthorDate: Thu Mar 17 01:06:35 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Mar 17 01:06:35 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=3e3c6c36 updating some meta-data version bump on vmware-workstation:11 making sure that the latest vmware-workstation:11 has bundled-libs support Package-Manager: portage-2.2.26 app-emulation/vmware-modules/metadata.xml | 5 +- .../vmware-modules/vmware-modules-304.3.ebuild | 113 + app-emulation/vmware-player/metadata.xml | 7 +- .../vmware-player-6.0.6.2700073.ebuild | 4 +- .../vmware-player-7.1.2.2780323-r1.ebuild | 4 +- .../vmware-player-7.1.2.2780323.ebuild | 4 +- app-emulation/vmware-tools/Manifest| 6 ++ app-emulation/vmware-tools/metadata.xml| 5 +- .../vmware-tools/vmware-tools-9.9.4.3206955.ebuild | 58 +++ app-emulation/vmware-vix/metadata.xml | 5 +- .../vmware-vix/vmware-vix-1.11.4.744019.ebuild | 2 +- app-emulation/vmware-vsphere-cli/metadata.xml | 1 - app-emulation/vmware-workstation/Manifest | 1 + app-emulation/vmware-workstation/metadata.xml | 5 +- .../vmware-workstation-10.0.6.2700073.ebuild | 4 +- .../vmware-workstation-11.1.2.2780323-r3.ebuild| 2 +- ...=> vmware-workstation-11.1.3.3206955-r2.ebuild} | 8 +- ...ld => vmware-workstation-11.1.3.3206955.ebuild} | 12 +-- 18 files changed, 220 insertions(+), 26 deletions(-) diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml index 313c162..dec09dc 100644 --- a/app-emulation/vmware-modules/metadata.xml +++ b/app-emulation/vmware-modules/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - vmware + + vmw...@gentoo.org + Gentoo VMware Project + VMware kernel modules. diff --git a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3.ebuild new file mode 100644 index 000..0980673 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-304.3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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" +IUSE="pax_kernel +vmci +vsock" + +RDEPEND="" +DEPEND="${RDEPEND} + || ( =app-emulation/vmware-player-7.1.${PV_MINOR}* + =app-emulation/vmware-workstation-11.1.${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 + if use vmci ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI" + fi + if use vsock ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS" + fi + + linux-info_pkg_setup + + linux-mod_pkg_setup + + VMWARE_GROUP=${VMWARE_GROUP:-vmware} + + VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock" + VMWARE_MODULE_LIST="vmblock vmmon vmnet" + use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" + use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_ALL}; 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" + use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch" + epatch &q
[gentoo-commits] proj/vmware:master commit in: eclass/
commit: 0cba229f49cba683ac1afbf0667b04ff7ed13bd4 Author: Evan Teran gmail com> AuthorDate: Fri Mar 18 03:13:44 2016 + Commit: Evan Teran gmail com> CommitDate: Fri Mar 18 03:13:44 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0cba229f initial support for vmware-12 eclass/vmware-bundle.eclass | 87 + 1 file changed, 87 insertions(+) diff --git a/eclass/vmware-bundle.eclass b/eclass/vmware-bundle.eclass new file mode 100644 index 000..3b019e9 --- /dev/null +++ b/eclass/vmware-bundle.eclass @@ -0,0 +1,87 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# @ECLASS: vmware-bundle.eclass +# @MAINTAINER: +# vmw...@gentoo.org +# @AUTHOR: +# Matt Whitlock <m...@whitlock.name> +# @BLURB: Provides extract functionality for vmware products bundles + +DEPEND="dev-libs/libxslt" + +vmware-bundle_extract-bundle-component() { + local bundle=${1:?} component=${2:?} dest=${3:-${2}} + cat > "${T}"/list-bundle-components.xsl <<-EOF + + http://www.w3.org/1999/XSL/Transform;> + + + + + + + + + + + + EOF + local -i bundle_size=$(stat -L -c'%s' "${bundle}") + local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${bundle}") + local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${bundle}") + local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${bundle}") + local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${bundle}") + tail -c+$((bundle_manifestOffset+1)) "${bundle}" 2> /dev/null | head -c$((bundle_manifestSize)) | + xsltproc "${T}"/list-bundle-components.xsl - | + while read -r component_offset component_size component_name ; do + if [[ ${component_name} == ${component} ]] ; then + ebegin "Extracting '${component_name}' component from '$(basename "${bundle}")'" + vmware-bundle_extract-component "${bundle}" "${dest}" $((bundle_dataOffset+component_offset)) + eend + fi + done +} + +vmware-bundle_extract-component() { + local component=${1:?} dest=${2:-.} + local -i offset=${3} + cat > "${T}"/list-component-files.xsl <<-EOF + + http://www.w3.org/1999/XSL/Transform;> + + + + + + + + + + + + + + EOF + local -i component_manifestOffset=$(od -An -j$((offset+9)) -N4 -tu4 "${component}") + local -i component_manifestSize=$(od -An -j$((offset+13)) -N4 -tu4 "${component}") + local -i component_dataOffset=$(od -An -j$((offset+17)) -N4 -tu4 "${component}") + local -i component_dataSize=$(od -An -j$((offset+21)) -N8 -tu8 "${component}") + tail -c+$((offset+component_manifestOffset+1)) "${component}" 2> /dev/null | + head -c$((component_manifestSize)) | xsltproc "${T}"/list-component-files.xsl - | + while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do + if [[ ${file_path} ]] ; then + file_path="${dest}/${file_path}" + mkdir -p "$(dirname "${file_path}")" || die + if [[ ${file_compressedSize} -gt 0 ]] ; then + echo -n '.' + tail -c+$((offset+component_dataOffset+file_offset+1)) "${component}" 2> /dev/null | + head -c$((file_compressedSize)) | gzip -cd > "${file_path}" || die + else + echo -n 'x' + fi + fi + done + echo +}
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 11f4e961c166dba8df17de09a97b6826a41f28c6 Author: Evan Teran gmail com> AuthorDate: Thu Mar 17 02:26:30 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Mar 17 02:26:30 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=11f4e961 app-emulation/vmware-modules: compiles on 4.5 kernels now Package-Manager: portage-2.2.26 .../vmware-modules/files/304-4.5-00-get_link.patch | 67 ++ .../vmware-modules/vmware-modules-304.3-r1.ebuild | 1 + 2 files changed, 68 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch new file mode 100644 index 000..169fc71 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch @@ -0,0 +1,67 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c +--- vmblock-only/linux/inode.c 2016-03-16 22:22:00.470080630 -0400 vmblock-only.new/linux/inode.c 2016-03-16 22:23:33.016081859 -0400 +@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru + static int InodeOpReadlink(struct dentry *, char __user *, int); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -63,7 +65,11 @@ static struct inode_operations LinkInode + struct inode_operations LinkInodeOps = { + #endif +.readlink= InodeOpReadlink, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++ .get_link = InodeOpGetLink, ++#else +.follow_link = InodeOpFollowlink, ++#endif + }; + + /* +@@ -222,7 +228,9 @@ InodeOpReadlink(struct dentry *dentry, + * + * + */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie) + #else + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) +@@ -238,18 +246,28 @@ InodeOpFollowlink(struct dentry *dentry, +VMBlockInodeInfo *iinfo; + +if (!dentry) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++ ret = -ECHILD; ++#else + Warning("InodeOpReadlink: invalid args from kernel\n"); + ret = -EINVAL; ++#endif + goto out; +} + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++ iinfo = INODE_TO_IINFO(inode); ++#else +iinfo = INODE_TO_IINFO(dentry->d_inode); ++#endif +if (!iinfo) { + ret = -EINVAL; + goto out; +} + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++ return (char *)(iinfo->name); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) +return *cookie = (char *)(iinfo->name); + #else +nd_set_link(nd, iinfo->name); diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild index 766eb32..86bea59 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild @@ -100,6 +100,7 @@ src_prepare() { kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch" kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch" kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch" + kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 0ecc3a12322a6ed9456cbb5d5d9136a2699280a8 Author: Evan Teran gmail com> AuthorDate: Thu Mar 17 01:44:05 2016 + Commit: Evan Teran gmail com> CommitDate: Thu Mar 17 01:44:05 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0ecc3a12 app-emulation/vmware-modules: now vmware-modules:11 compiles cleanly on 4.2 Package-Manager: portage-2.2.26 .../vmware-modules/files/304-4.2-00-inode_op.patch | 45 + .../files/304-4.2-01-vmci_vmalloc.patch| 13 .../vmware-modules/files/304-4.2-02-vsock.patch| 77 ++ .../vmware-modules/files/304-4.2-03-vsock.patch| 14 .../vmware-modules/vmware-modules-304.3.ebuild | 4 ++ 5 files changed, 153 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch new file mode 100644 index 000..e6f2acb --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch @@ -0,0 +1,45 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c +--- vmblock-only/linux/inode.c 2016-03-16 21:24:25.771034759 -0400 vmblock-only.new/linux/inode.c 2016-03-16 21:26:22.697036311 -0400 +@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru + static int InodeOpReadlink(struct dentry *, char __user *, int); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else + static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -220,7 +222,9 @@ InodeOpReadlink(struct dentry *dentry, + * + * + */ +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie) ++#else + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void * + #else +@@ -228,6 +232,7 @@ static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink + struct nameidata *nd) // OUT: stores result ++#endif + { +int ret; +VMBlockInodeInfo *iinfo; +@@ -244,7 +249,11 @@ InodeOpFollowlink(struct dentry *dentry, + goto out; +} + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ return *cookie = (char *)(iinfo->name); ++#else +nd_set_link(nd, iinfo->name); ++#endif + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch new file mode 100644 index 000..2296c06 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch @@ -0,0 +1,13 @@ +diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c +--- vmci-only/linux/driver.c 2015-11-03 19:27:55.0 -0500 vmci-only.new/linux/driver.c 2016-03-16 21:30:47.646039829 -0400 +@@ -26,6 +26,9 @@ + + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++#include ++#endif + #include + #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) + # include diff --git a/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch new file mode 100644 index 000..bdac109 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch @@ -0,0 +1,77 @@ +diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c +--- vsock-only/linux/af_vsock.c2016-03-16 21:31:24.582040320 -0400 vsock-only.new/linux/af_vsock.c2016-03-16 21:37:22.140045067 -0400 +@@ -231,7 +231,16 @@ static int VSockVmciStreamSetsockopt(str + + static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user * optlen); +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static int VSockVmciDgramSendmsg( ++ struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciDgramRecvmsg(struct socket *sock, ++ struct msghdr *msg, size_t len, int flags); ++static int VSockVmciStreamSendmsg( ++ struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciStreamRecvmsg(struct socket *sock, ++ struct msghdr *msg, size_t len, int flags); ++#else + static int VSockVmciDgramSendmsg(struct kiocb *kiocb, + struct socket *sock, struct msghdr *msg, size_t len); + static int VSockVmciDgramRecvmsg(struct ki
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/
commit: 95398f53a43171553a660f2b87e38a5b96a7aba9 Author: Evan Teran gmail com> AuthorDate: Fri Mar 18 03:14:50 2016 + Commit: Evan Teran gmail com> CommitDate: Fri Mar 18 03:14:50 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=95398f53 app-emulation/vmware-workstation: initial vmware-12 support Package-Manager: portage-2.2.26 app-emulation/vmware-workstation/Manifest | 1 + .../vmware-workstation/files/vmware-12.1.rc| 44 ++ .../vmware-workstation/files/vmware-server-12.1.rc | 55 ++ ...orkstation-12.1.0.3272444-unbundle-libcds.patch | Bin 0 -> 3414 bytes .../vmware-workstation-12.1.0.3272444-r1.ebuild| 622 + 5 files changed, 722 insertions(+) diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index f768cf1..1dfe000 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -2,5 +2,6 @@ DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26b DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094 +DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 diff --git a/app-emulation/vmware-workstation/files/vmware-12.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc new file mode 100644 index 000..f2dc692 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-12.1.rc @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + + # quiet for vmci because it may not be there + modprobe -vq vmci || modprobe -v vmw_vmci + eend $? + + # vmci or vmw_vmci was loaded by the previous modprobe + # no need to do it here + modprobe -av vmmon vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + + # quiet for vmci becau
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 638abe578790e0a4d965e712797faee7a47a7019 Author: Evan Teran gmail com> AuthorDate: Fri Mar 18 03:13:10 2016 + Commit: Evan Teran gmail com> CommitDate: Fri Mar 18 03:13:10 2016 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=638abe57 app-emulation/vmware-modules: initial support for vmware-12 Package-Manager: portage-2.2.26 .../vmware-modules/files/308-3.10-00-dentry.patch | 43 ++ .../vmware-modules/files/308-3.10-01-inode.patch | 94 + .../vmware-modules/files/308-3.10-02-control.patch | 57 .../vmware-modules/files/308-3.10-03-inline.patch | 14 ++ .../vmware-modules/files/308-3.11-00-readdir.patch | 41 ++ .../vmware-modules/files/308-3.11-01-filldir.patch | 53 .../vmware-modules/files/308-3.15-00-vsock.patch | 46 +++ .../files/308-3.18-00-version-redefined.patch | 25 .../files/308-3.19-00-compat-namei.patch | 24 .../files/308-3.19-02-vmblock-path.patch | 67 + .../vmware-modules/files/308-3.19-04-iovec.patch | 59 .../files/308-3.19-05-vmci_qpair.patch | 25 .../vmware-modules/files/308-3.19-06-vsock.patch | 16 +++ .../vmware-modules/files/308-3.19-07-vsock.patch | 13 ++ .../vmware-modules/files/308-4.01-00-vsock.patch | 61 + .../files/308-4.02-00-nd_set_link.patch| 56 .../files/308-4.02-01-sk_alloc.patch | 22 +++ .../files/308-4.03-00-vmci-misc_deregister.patch | 27 .../files/308-4.03-00-vmmon-misc_deregister.patch | 14 ++ .../files/308-4.05-00-vmblock-follow_link.patch| 56 app-emulation/vmware-modules/files/308-apic.patch | 12 ++ .../vmware-modules/files/308-hardened.patch| 89 .../files/308-makefile-include.patch | 65 + .../files/308-makefile-kernel-dir.patch| 85 .../vmware-modules/files/308-netdevice.patch | 24 .../vmware-modules/vmware-modules-308.1.0.ebuild | 149 + 26 files changed, 1237 insertions(+) diff --git a/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch new file mode 100644 index 000..5cc445f --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch @@ -0,0 +1,43 @@ +Minor change the API, now it just gets passed flags instead of a pointer to the nameidata +--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.0 +0300 c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300 +@@ -32,7 +32,11 @@ + #include "block.h" + + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd); ++#else ++static int DentryOpRevalidate(struct dentry *dentry, unsigned int); ++#endif + + struct dentry_operations LinkDentryOps = { +.d_revalidate = DentryOpRevalidate, +@@ -58,9 +62,12 @@ + * + */ + +-static int +-DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating +- struct nameidata *nd) // IN: lookup flags & intent ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd) ++#else ++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags) ++#endif ++ + { +VMBlockInodeInfo *iinfo; +struct nameidata actualNd; +@@ -101,7 +108,11 @@ +if (actualDentry && +actualDentry->d_op && +actualDentry->d_op->d_revalidate) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++ return actualDentry->d_op->d_revalidate(actualDentry, flags); ++#else + return actualDentry->d_op->d_revalidate(actualDentry, nd); ++#endif +} + +if (compat_path_lookup(iinfo->name, 0, )) { diff --git a/app-emulation/vmware-modules/files/308-3.10-01-inode.patch b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch new file mode 100644 index 000..e12d84d --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch @@ -0,0 +1,94 @@ +Minor change the API, now it just gets passed flags instead of a pointer to the nameidata +Properly initializes UID/GID with repsect to namespaces +Some changes the readlink/setlink APIs +--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.0 +0300 c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300 +@@ -35,9 +35,15 @@ + + + /* Inode operations */ +-static struct dentry *InodeOpLookup(struct inode *dir, +-struct dentry *dentry, struct nameidata *nd); ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd); + st
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/, app-emulation/vmware-vsphere-cli/
commit: 268c44ba9c64cde8c244b96088a5b196e1bcbfbc Author: Evan Teran gmail com> AuthorDate: Tue Oct 6 03:39:54 2015 + Commit: Evan Teran gmail com> CommitDate: Tue Oct 6 03:39:54 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=268c44ba trying to fix some dependancy issues, also fixed headers and KEYWORDS of some ebuilds .../vmware-vsphere-cli-4.1.0.254719-r1.ebuild | 2 +- .../vmware-workstation-11.1.2.2780323-r3.ebuild| 530 + 2 files changed, 531 insertions(+), 1 deletion(-) diff --git a/app-emulation/vmware-vsphere-cli/vmware-vsphere-cli-4.1.0.254719-r1.ebuild b/app-emulation/vmware-vsphere-cli/vmware-vsphere-cli-4.1.0.254719-r1.ebuild index 998aa39..743061a 100644 --- a/app-emulation/vmware-vsphere-cli/vmware-vsphere-cli-4.1.0.254719-r1.ebuild +++ b/app-emulation/vmware-vsphere-cli/vmware-vsphere-cli-4.1.0.254719-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ # Unlike many other binary packages the user doesn't need to agree to a licence # to download VMWare. The agreeing to a licence is part of the configure step diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r3.ebuild new file mode 100644 index 000..4e31501 --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r3.ebuild @@ -0,0 +1,530 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle + +MY_PN="VMware-Workstation" +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" + +SYSTEMD_UNITS_TAG="gentoo-01" + +DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/workstation/; +BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/; +SRC_URI=" + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz + " +LICENSE="vmware GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="cups bundled-libs doc ovftool server vix vmware-tools" +RESTRICT="mirror strip" + +BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib + +BUNDLED_LIBS=" + libXau.so.6 + libXcomposite.so.1 + libXcursor.so.1 + libXdamage.so.1 + libXdmcp.so.6 + libXfixes.so.3 + libXft.so.2 + libXinerama.so.1 + libXrandr.so.2 + libXrender.so.1 + libaio.so.1 + libatk-1.0.so.0 + libatkmm-1.6.so.1 + libatspi.so.0 + libcairo.so.2 + libcairomm-1.0.so.1 + libcurl.so.4 +" + +BUNDLED_LIB_DEPENDS=" + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + dev-libs/libaio + dev-libs/atk + dev-cpp/atkmm + app-accessibility/at-spi2-core + x11-libs/cairo + dev-cpp/cairomm + net-misc/curl +" + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=" + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-cpp/libgnomecanvasmm + dev-cpp/pangomm + dev-libs/glib:2 + dev-libs/icu + dev-libs/expat + >=dev-libs/libgcrypt-1.5.0:0/11 + dev-libs/libsigc++:2 + dev-libs/libxml2 + dev-libs/openssl:0.9.8 + dev-libs/xmlrpc-c + gnome-base/libgnomecanvas + gnome-base/libgtop:2 + gnome-base/librsvg:2 + gnome-base/orbit + media-libs/fontconfig + media-libs/freetype + media-libs/libart_lgpl + media-libs/libpng:1.2 + media-libs/libpng + media-libs/tiff:3 + cups? ( net-print/cups ) + sys-devel/gcc + sys-fs/fuse + sys-libs/glibc + sys-libs/zlib + x11-libs/gtk+:2 + x11-libs/libgksu + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/libXi + x11-libs/libXtst + x11-libs/pango + x11-libs/pangox-compat + x11-libs/startup-notification + x11-themes/hicolor-icon-theme + !app-emulation/vmware-player + !bundled-libs? ( ${BUN
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: 41a052f41c8a06d2a1690754385678993b4dc035 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:42:45 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:42:45 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=41a052f4 fixing issue from: https://github.com/gentoo/vmware/issues/7 Despite /etc/vmware/config telling it to look for the libs in /opt/vmware/lib, it still insisted in looking in /usr/lib/vmware. So a symlink solves the issue fairly cleanly. Also added a minor improvement to the build Package-Manager: portage-2.2.20 app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild | 5 - app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild index 0a7ea6a..7d271f1 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild @@ -134,6 +134,9 @@ src_install() { dosym ${VM_INSTALL_DIR}/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ ${VM_INSTALL_DIR}/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 + # https://github.com/gentoo/vmware/issues/7 + dosym ${VM_INSTALL_DIR}lib/vmware/ /usr/$(get_libdir)/vmware + # install the ancillaries insinto /usr doins -r share @@ -203,7 +206,7 @@ src_install() { local initscript=${T}/vmware.rc sed -e s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g \ - ${FILESDIR}/vmware-11.0.rc ${initscript} || die + ${FILESDIR}/vmware-11.${PV_MINOR}.rc ${initscript} || die newinitd ${initscript} vmware || die # fill in variable placeholders diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild index 3c04f5e..d72a167 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -136,6 +136,9 @@ src_install() { dosym ${VM_INSTALL_DIR}/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ ${VM_INSTALL_DIR}/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 + # https://github.com/gentoo/vmware/issues/7 + dosym ${VM_INSTALL_DIR}/lib/vmware/ /usr/$(get_libdir)/vmware + # install the ancillaries insinto /usr doins -r share @@ -216,7 +219,7 @@ src_install() { local initscript=${T}/vmware.rc sed -e s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g \ - ${FILESDIR}/vmware-11.0.rc ${initscript} || die + ${FILESDIR}/vmware-11.${PV_MINOR}.rc ${initscript} || die newinitd ${initscript} vmware || die systemd_dounit ${FILESDIR}/vmware-usbarbitrator.service
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: a5b6a684848ac6a47cac4838f08c1c021382c8d0 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:51:35 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:51:35 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=a5b6a684 some fixes/cleanups for vmware player Package-Manager: portage-2.2.20 .../vmware-player-7.1.0.2496824.ebuild | 24 ++ 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild index 7d271f1..d72a167 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle +inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd vmware-bundle MY_PN=VMware-Player MY_PV=$(get_version_component_range 1-3) @@ -22,7 +22,7 @@ SRC_URI= LICENSE=vmware GPL-2 SLOT=0 KEYWORDS=-* ~amd64 -IUSE=cups doc +vmware-tools +IUSE=cups doc ovftool +vmware-tools RESTRICT=strip # vmware-workstation should not use virtual/libc as this is a @@ -93,10 +93,12 @@ src_unpack() { vmware-usbarbitrator \ vmware-network-editor \ vmware-player-setup - #vmware-ovftool do vmware-bundle_extract-bundle-component ${bundle} ${component} ${S} done + + use ovftool \ + vmware-bundle_extract-bundle-component ${bundle} vmware-ovftool } src_prepare() { @@ -135,7 +137,7 @@ src_install() { ${VM_INSTALL_DIR}/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 # https://github.com/gentoo/vmware/issues/7 - dosym ${VM_INSTALL_DIR}lib/vmware/ /usr/$(get_libdir)/vmware + dosym ${VM_INSTALL_DIR}/lib/vmware/ /usr/$(get_libdir)/vmware # install the ancillaries insinto /usr @@ -157,6 +159,17 @@ src_install() { exeinto ${VM_INSTALL_DIR}/lib/vmware/setup doexe vmware-config + # install ovftool + if use ovftool; then + cd ${S} + + insinto ${VM_INSTALL_DIR}/lib/vmware-ovftool + doins -r vmware-ovftool/* + + chmod 0755 ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/{ovftool,ovftool.bin} + dosym ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/ovftool ${VM_INSTALL_DIR}/bin/ovftool + fi + # create symlinks for the various tools local tool ; for tool in thnuclnt vmplayer{,-daemon} \ vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do @@ -209,6 +222,9 @@ src_install() { ${FILESDIR}/vmware-11.${PV_MINOR}.rc ${initscript} || die newinitd ${initscript} vmware || die + systemd_dounit ${FILESDIR}/vmware-usbarbitrator.service + systemd_dounit ${FILESDIR}/vmware-network.service + # fill in variable placeholders sed -e s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g \ -i ${D}${VM_INSTALL_DIR}/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: 88f83e8ee7273c637bd296c99db3a5fbb5542b0f Author: Christian Affolter christian.affolter AT stepping-stone DOT ch AuthorDate: Mon Aug 3 13:14:01 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Aug 3 13:14:01 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=88f83e8e Added support for the installation of the ovftool. Most of the code was taken from the app-emulation/vmware-workstation ebuild originating from the same overlay. app-emulation/vmware-player/metadata.xml | 1 + .../vmware-player/vmware-player-7.1.2.2780323.ebuild | 18 -- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml index fac5e87..c3509a5 100644 --- a/app-emulation/vmware-player/metadata.xml +++ b/app-emulation/vmware-player/metadata.xml @@ -3,6 +3,7 @@ pkgmetadata herdvmware/herd use + flag name='ovftool'Install OVF tool./flag flag name=vmware-toolsInstall VMware Tools images/flag /use /pkgmetadata diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild index 0a7ea6a..1d3d36b 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -22,7 +22,7 @@ SRC_URI= LICENSE=vmware GPL-2 SLOT=0 KEYWORDS=-* ~amd64 -IUSE=cups doc +vmware-tools +IUSE=cups doc ovftool +vmware-tools RESTRICT=strip # vmware-workstation should not use virtual/libc as this is a @@ -93,10 +93,12 @@ src_unpack() { vmware-usbarbitrator \ vmware-network-editor \ vmware-player-setup - #vmware-ovftool do vmware-bundle_extract-bundle-component ${bundle} ${component} ${S} done + + use ovftool \ + vmware-bundle_extract-bundle-component ${bundle} vmware-ovftool } src_prepare() { @@ -154,6 +156,18 @@ src_install() { exeinto ${VM_INSTALL_DIR}/lib/vmware/setup doexe vmware-config +# install ovftool +if use ovftool; then +cd ${S} + +insinto ${VM_INSTALL_DIR}/lib/vmware-ovftool +doins -r vmware-ovftool/* + +chmod 0755 ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/{ovftool,ovftool.bin} +dosym ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/ovftool ${VM_INSTALL_DIR}/bin/ovftool +fi + + # create symlinks for the various tools local tool ; for tool in thnuclnt vmplayer{,-daemon} \ vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
[gentoo-commits] proj/vmware:master commit in: /
commit: a1639ad295b1b206960307911c2d06e267824c6e Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:01:29 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:01:29 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=a1639ad2 Merge branch 'stepping-stone-feature/ovftool' app-emulation/vmware-player/metadata.xml | 1 + .../vmware-player/vmware-player-7.1.2.2780323.ebuild | 18 -- 2 files changed, 17 insertions(+), 2 deletions(-)
[gentoo-commits] proj/vmware:master commit in: /
commit: bbbde76d3071f2aaccc848c256f4e824dabe Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:01:11 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:01:11 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=bbbde76a Merge branch 'feature/ovftool' of git://github.com/stepping-stone/vmware into stepping-stone-feature/ovftool app-emulation/vmware-player/metadata.xml | 1 + .../vmware-player/vmware-player-7.1.2.2780323.ebuild | 18 -- 2 files changed, 17 insertions(+), 2 deletions(-)
[gentoo-commits] proj/vmware:master commit in: /
commit: 6065d5456b4082cd1e58ed7421b74ce69791dee6 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:00:02 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:00:02 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=6065d545 Merge branch 'stepping-stone-feature/systemd' .../vmware-player/files/vmware-network.service | 17 + .../vmware-player/files/vmware-usbarbitrator.service| 11 +++ .../vmware-player/vmware-player-7.1.2.2780323.ebuild| 5 - 3 files changed, 32 insertions(+), 1 deletion(-)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-player/files/
commit: 741e4d9a127566fd90531a2565d9628764622176 Author: Christian Affolter christian.affolter AT stepping-stone DOT ch AuthorDate: Tue Aug 4 15:10:12 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Aug 4 15:10:12 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=741e4d9a Added systemd service support for app-emulation/vmware-player Created two systemd service unit files according to the existing OpenRC init script: * vmware-usbarbitrator.service manages the VMware USB Arbitrator * vmware-network.service manages the VMware host network It was decided to split the existing OpenRC init script, in order to have a better dependency handling and to adhere to Gentoo's Systemd/Ebuild policy. .../vmware-player/files/vmware-network.service | 17 + .../vmware-player/files/vmware-usbarbitrator.service| 11 +++ .../vmware-player/vmware-player-7.1.2.2780323.ebuild| 5 - 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app-emulation/vmware-player/files/vmware-network.service b/app-emulation/vmware-player/files/vmware-network.service new file mode 100644 index 000..abc6648 --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-network.service @@ -0,0 +1,17 @@ +[Unit] +Description=VMware Network +Requires=local-fs.target +Wants=network.target vmware-usbarbitrator.service +After=local-fs.target network.target vmware-usbarbitrator.service + +[Service] +Type=simple +ExecStartPre=/sbin/modprobe -av vmci vmmon vsock vmblock vmnet +ExecStart=/opt/vmware/bin/vmware-networks --start +ExecStop=/opt/vmware/bin/vmware-networks --stop +ExecStopPost=/sbin/modprobe -rv vmmon vsock vmblock vmnet vmci +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/app-emulation/vmware-player/files/vmware-usbarbitrator.service b/app-emulation/vmware-player/files/vmware-usbarbitrator.service new file mode 100644 index 000..16a0fb8 --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-usbarbitrator.service @@ -0,0 +1,11 @@ +[Unit] +Description=VMware USB Arbitrator +Requires=local-fs.target +Before=vmware-network.service + +[Service] +Type=forking +ExecStart=/opt/vmware/bin/vmware-usbarbitrator + +[Install] +WantedBy=multi-user.target diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild index 0a7ea6a..1dff576 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle +inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd vmware-bundle MY_PN=VMware-Player MY_PV=$(get_version_component_range 1-3) @@ -206,6 +206,9 @@ src_install() { ${FILESDIR}/vmware-11.0.rc ${initscript} || die newinitd ${initscript} vmware || die + systemd_dounit ${FILESDIR}/vmware-usbarbitrator.service + systemd_dounit ${FILESDIR}/vmware-network.service + # fill in variable placeholders sed -e s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g \ -i ${D}${VM_INSTALL_DIR}/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: ec119fefd1f2cd62b5252afb86ae47011f64007b Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:09:26 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:09:26 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=ec119fef updating tools Package-Manager: portage-2.2.20 app-emulation/vmware-tools/Manifest| 6 +++ .../vmware-tools/vmware-tools-9.9.3.2780323.ebuild | 54 ++ 2 files changed, 60 insertions(+) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index 6e7e19e..cb100e4 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -1,18 +1,24 @@ DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdf455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f +DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4 +DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed266ef888c8fd9a9f0d49083767f525b03bb2725d241c048308e8660b67254 SHA512 af12a60a70727db6ff98bfcc1693eda8c78fc09f3c5769eb42cd2ddfc36b6ae411309414d922d6fbcbfddab7875822a57d1bbe4afe2e00afd6afc09c8d959d89 WHIRLPOOL b46ef6bd824758bd2c4fdf8b3934a99baa23a4c2c6b9728a9ff464363c8c31050ffbe1392470191514f50d2f1ac208092f5d789e8cde1681d317636cce87d1b3 DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6 DIST vmware-tools-netware-9.9.2
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: 2598ce045155d192245f23bfe3164d1a92636f88 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Wed Aug 12 05:05:37 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Wed Aug 12 05:05:37 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=2598ce04 cleaning up the ebuild slightly Package-Manager: portage-2.2.20 .../vmware-player/vmware-player-7.1.2.2780323.ebuild| 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild index c115c63..3c04f5e 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -156,17 +156,16 @@ src_install() { exeinto ${VM_INSTALL_DIR}/lib/vmware/setup doexe vmware-config -# install ovftool -if use ovftool; then -cd ${S} + # install ovftool + if use ovftool; then + cd ${S} -insinto ${VM_INSTALL_DIR}/lib/vmware-ovftool -doins -r vmware-ovftool/* - -chmod 0755 ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/{ovftool,ovftool.bin} -dosym ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/ovftool ${VM_INSTALL_DIR}/bin/ovftool -fi + insinto ${VM_INSTALL_DIR}/lib/vmware-ovftool + doins -r vmware-ovftool/* + chmod 0755 ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/{ovftool,ovftool.bin} + dosym ${D}${VM_INSTALL_DIR}/lib/vmware-ovftool/ovftool ${VM_INSTALL_DIR}/bin/ovftool + fi # create symlinks for the various tools local tool ; for tool in thnuclnt vmplayer{,-daemon} \
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: ef832832f7175fd2b20681264a201bdbc4b6a179 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Jul 23 02:41:04 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Jul 23 02:41:04 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=ef832832 adding correct init scripts to the ebuilds Package-Manager: portage-2.2.20 app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild | 2 +- app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild | 2 +- app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild index f859e7f..72c5e45 100644 --- a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild +++ b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild @@ -204,7 +204,7 @@ src_install() { local initscript=${T}/vmware.rc sed -e s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g \ - ${FILESDIR}/vmware-3.0.rc ${initscript} || die + ${FILESDIR}/vmware-10.0.rc ${initscript} || die newinitd ${initscript} vmware || die # fill in variable placeholders diff --git a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild index eb28f9e..0a7ea6a 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild @@ -203,7 +203,7 @@ src_install() { local initscript=${T}/vmware.rc sed -e s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g \ - ${FILESDIR}/vmware-3.0.rc ${initscript} || die + ${FILESDIR}/vmware-11.0.rc ${initscript} || die newinitd ${initscript} vmware || die # fill in variable placeholders diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild index eb28f9e..0a7ea6a 100644 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -203,7 +203,7 @@ src_install() { local initscript=${T}/vmware.rc sed -e s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g \ - ${FILESDIR}/vmware-3.0.rc ${initscript} || die + ${FILESDIR}/vmware-11.0.rc ${initscript} || die newinitd ${initscript} vmware || die # fill in variable placeholders
[gentoo-commits] proj/vmware:master commit in: /
commit: 86156cefdb86e0234f1378e2a0f712af4012d10b Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Jul 23 02:41:20 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Jul 23 02:41:20 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=86156cef Merge branch 'master' of git://git.gentoo.org/proj/vmware .../files/vmware-server-9.0.rc} | 4 ++-- scripts/copyfrommaintree| 21 + scripts/copytomaintree | 21 + 3 files changed, 44 insertions(+), 2 deletions(-)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/
commit: f6c8e4d559d23011b8ee56d8bb6c2c8ea1595f5f Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sun Jul 19 02:09:38 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sun Jul 19 02:09:38 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f6c8e4d5 adding one last missing file .../vmware-workstation/files/vmware-server-9.0.rc | 55 ++ 1 file changed, 55 insertions(+) diff --git a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc new file mode 100644 index 000..3b71339 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-9.0.rc,v 1.1 2012/12/09 14:30:38 vadimk Exp $ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin Shutdown VMs in the AutoStart Sequence + local HOHO_ADMIN=$(@@BINDIR@@/vmware-wssc-adminTool @@ETCDIR@@/hostd/authorization.xml 2/dev/null) + + if [ x != x${HOHO_ADMIN} ]; then + @@BINDIR@@/vmware-vim-cmd -U ${HOHO_ADMIN} hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +}
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/, app-emulation/vmware-workstation/files/
commit: ee77b844ba07b95724a5bf28a6d2b96659829fa0 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sun Jul 19 01:54:50 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sun Jul 19 01:54:50 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=ee77b844 addressing concerns from bug 531682. Hopefully this resolves them Package-Manager: portage-2.2.20 .../vmware-workstation/files/configure-hostd.sh| 20 .../files/list-bundle-components.xsl | 17 +++ .../files/list-component-files.xsl | 19 .../vmware-workstation/files/vmware-11.0.rc| 44 + .../vmware-workstation/files/vmware-9.0.rc | 37 +++ .../vmware-workstation/files/vmware-server-10.0.rc | 55 ++ .../vmware-workstation/files/vmware-server-11.0.rc | 55 ++ .../vmware-workstation/files/vmware-server-11.1.rc | 55 ++ .../vmware-workstation/files/vmware-server-11.2.rc | 55 ++ .../vmware-workstation-11.1.0.2496824.ebuild | 2 +- .../vmware-workstation-11.1.2.2780323.ebuild | 2 +- 11 files changed, 359 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh new file mode 100644 index 000..480e903 --- /dev/null +++ b/app-emulation/vmware-workstation/files/configure-hostd.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +action=$1 + +case $action in + add) +rc-update -q add vmware-workstation-server default +rc-service vmware-workstation-server start +;; + remove) +rc-update -q del vmware-workstation-server default +rc-service vmware-workstation-server stop +;; + status) +rc-service -q vmware-workstation-server status +;; + *) +exit 1 +;; +esac diff --git a/app-emulation/vmware-workstation/files/list-bundle-components.xsl b/app-emulation/vmware-workstation/files/list-bundle-components.xsl new file mode 100644 index 000..db1a4e4 --- /dev/null +++ b/app-emulation/vmware-workstation/files/list-bundle-components.xsl @@ -0,0 +1,17 @@ +?xml version=1.0 encoding=ISO-8859-1? +xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + + xsl:output omit-xml-declaration=yes/ + + xsl:template match=text()/ + + xsl:template match=/bundle/components/component + xsl:value-of select=@offset/ + xsl:text /xsl:text + xsl:value-of select=@size/ + xsl:text /xsl:text + xsl:value-of select=@name/ + xsl:text#10;/xsl:text + /xsl:template + +/xsl:stylesheet diff --git a/app-emulation/vmware-workstation/files/list-component-files.xsl b/app-emulation/vmware-workstation/files/list-component-files.xsl new file mode 100644 index 000..91c6152 --- /dev/null +++ b/app-emulation/vmware-workstation/files/list-component-files.xsl @@ -0,0 +1,19 @@ +?xml version=1.0 encoding=ISO-8859-1? +xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + + xsl:output omit-xml-declaration=yes/ + + xsl:template match=text()/ + + xsl:template match=/component/fileset/file + xsl:value-of select=@offset/ + xsl:text /xsl:text + xsl:value-of select=@compressedSize/ + xsl:text /xsl:text + xsl:value-of select=@uncompressedSize/ + xsl:text /xsl:text + xsl:value-of select=@path/ + xsl:text#10;/xsl:text + /xsl:template + +/xsl:stylesheet diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc new file mode 100644 index 000..2a827bc --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + + # quiet for vmci because it may not be there + modprobe -vq vmci || modprobe -v vmw_vmci + eend $? + + # vmci or vmw_vmci was loaded by the previous modprobe + # no need to do it here + modprobe -av vmmon vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/files/
commit: d63e297054f2ac56718da950322547d492640ab5 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sun Jul 19 01:55:23 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sun Jul 19 01:55:23 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d63e2970 addressing comments from bug #531682, hopefully this resolves them .../vmware-player/files/list-bundle-components.xsl | 17 +++ .../vmware-player/files/list-component-files.xsl | 19 app-emulation/vmware-player/files/vmware-10.0.rc | 37 +++ app-emulation/vmware-player/files/vmware-11.0.rc | 44 + app-emulation/vmware-player/files/vmware-11.1.rc | 44 + app-emulation/vmware-player/files/vmware-11.2.rc | 44 + .../vmware-player/files/vmware-server-10.0.rc | 55 ++ .../vmware-player/files/vmware-server-11.0.rc | 55 ++ .../vmware-player/files/vmware-server-11.1.rc | 55 ++ .../vmware-player/files/vmware-server-11.2.rc | 55 ++ 10 files changed, 425 insertions(+) diff --git a/app-emulation/vmware-player/files/list-bundle-components.xsl b/app-emulation/vmware-player/files/list-bundle-components.xsl new file mode 100644 index 000..db1a4e4 --- /dev/null +++ b/app-emulation/vmware-player/files/list-bundle-components.xsl @@ -0,0 +1,17 @@ +?xml version=1.0 encoding=ISO-8859-1? +xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + + xsl:output omit-xml-declaration=yes/ + + xsl:template match=text()/ + + xsl:template match=/bundle/components/component + xsl:value-of select=@offset/ + xsl:text /xsl:text + xsl:value-of select=@size/ + xsl:text /xsl:text + xsl:value-of select=@name/ + xsl:text#10;/xsl:text + /xsl:template + +/xsl:stylesheet diff --git a/app-emulation/vmware-player/files/list-component-files.xsl b/app-emulation/vmware-player/files/list-component-files.xsl new file mode 100644 index 000..91c6152 --- /dev/null +++ b/app-emulation/vmware-player/files/list-component-files.xsl @@ -0,0 +1,19 @@ +?xml version=1.0 encoding=ISO-8859-1? +xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + + xsl:output omit-xml-declaration=yes/ + + xsl:template match=text()/ + + xsl:template match=/component/fileset/file + xsl:value-of select=@offset/ + xsl:text /xsl:text + xsl:value-of select=@compressedSize/ + xsl:text /xsl:text + xsl:value-of select=@uncompressedSize/ + xsl:text /xsl:text + xsl:value-of select=@path/ + xsl:text#10;/xsl:text + /xsl:template + +/xsl:stylesheet diff --git a/app-emulation/vmware-player/files/vmware-10.0.rc b/app-emulation/vmware-player/files/vmware-10.0.rc new file mode 100644 index 000..82e45f1 --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-10.0.rc @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + modprobe -v vmci || modprobe -v vmw_vmci + eend $? + modprobe -av vmmon vmci vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + modprobe -rv vmci || modprobe -rv vmw_vmci + eend $? +} diff --git a/app-emulation/vmware-player/files/vmware-11.0.rc b/app-emulation/vmware-player/files/vmware-11.0.rc new file mode 100644 index 000..2a827bc --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-11.0.rc @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: 1250c78913e6593944098a62bf8f2812068edf68 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Jul 14 02:01:17 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Jul 14 02:01:17 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1250c789 added some comments for patches Package-Manager: portage-2.2.20 app-emulation/vmware-modules/files/304-3.10-00-dentry.patch| 1 + app-emulation/vmware-modules/files/304-3.10-01-inode.patch | 3 +++ app-emulation/vmware-modules/files/304-3.10-02-control.patch | 2 ++ app-emulation/vmware-modules/files/304-3.10-03-inline.patch| 1 + app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch | 1 + app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch | 1 + app-emulation/vmware-modules/files/304-3.19-01-dentry.patch| 1 + app-emulation/vmware-modules/files/304-3.19-03-iovec.patch | 1 + app-emulation/vmware-modules/files/304-3.19-04-iovec.patch | 1 + app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch| 1 + app-emulation/vmware-modules/files/304-3.19-06-vsock.patch | 1 + app-emulation/vmware-modules/files/304-3.19-07-vsock.patch | 1 + 12 files changed, 15 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch index a0bb8b8..5cc445f 100644 --- a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch +++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch @@ -1,3 +1,4 @@ +Minor change the API, now it just gets passed flags instead of a pointer to the nameidata --- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.0 +0300 +++ c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300 @@ -32,7 +32,11 @@ diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch index cf4ccd9..e12d84d 100644 --- a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch +++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch @@ -1,3 +1,6 @@ +Minor change the API, now it just gets passed flags instead of a pointer to the nameidata +Properly initializes UID/GID with repsect to namespaces +Some changes the readlink/setlink APIs --- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.0 +0300 +++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300 @@ -35,9 +35,15 @@ diff --git a/app-emulation/vmware-modules/files/304-3.10-02-control.patch b/app-emulation/vmware-modules/files/304-3.10-02-control.patch index bd3a265..9288353 100644 --- a/app-emulation/vmware-modules/files/304-3.10-02-control.patch +++ b/app-emulation/vmware-modules/files/304-3.10-02-control.patch @@ -1,3 +1,5 @@ +The API to create proc entries now takes the file ops structure directly, instead of being set after the fact +Using new __getname/__putname API --- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.0 +0300 +++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300 @@ -208,9 +208,11 @@ diff --git a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch index 73c2a5f..fa8f36a 100644 --- a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch +++ b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch @@ -1,3 +1,4 @@ +Hushes a warning --- a/vmmon-only/linux/driver.c2015-02-07 03:54:16.0 +0300 +++ c/vmmon-only/linux/driver.c2015-02-24 03:58:06.042605293 +0300 @@ -1328,7 +1328,9 @@ diff --git a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch index 2d38824..22d6325 100644 --- a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch +++ b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch @@ -1,3 +1,4 @@ +Hushes some (but not all warnings) relating to redefinitions of this define --- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.0 +0300 +++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300 @@ -53,7 +53,9 @@ diff --git a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch index ec73500..0182077 100644 --- a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch +++ b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch @@ -1,3 +1,4 @@ +A copy of this since it is no longer exported by the kernel headers --- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.0 +0300 +++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300 @@ -21,6 +21,20 @@ diff --git a/app
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: f1393d011cc7d398deb2da9395af4b52f8cdca68 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Jul 14 01:15:42 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Jul 14 01:15:42 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f1393d01 version bump for vmware-workstation 11 and associated player/modules Package-Manager: portage-2.2.20 app-emulation/vmware-player/Manifest | 1 + .../vmware-player-7.1.2.2780323.ebuild | 244 + 2 files changed, 245 insertions(+) diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index 5f73a3b..466f720 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,3 +1,4 @@ DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59eb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88 DIST VMware-Player-7.1.0-2496824.x86_64.bundle.tar 211077120 SHA256 80259e2b9337d4193da27109634fcb112e40241038f6956fa0e4e3b2f19900af SHA512 28f51f5b167fee8ad3c77fc3c36b0bb084e9f7e891f29952293f5857dcc1e03427d8db33a013abd64145293e19866f3c7d61e6e0d008eb94a1a349e9e8176459 WHIRLPOOL bca1a430a33914c004ddaaf13788ec26fa859a959f017c85b398f72c8b9af2da58c2f96c3d4034ab2d18aded07a304b4d30291eb422e692baefc833e47aec430 +DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0 diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild new file mode 100644 index 000..eb28f9e --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild,v 1.1 2014/04/19 15:01:08 dilfridge Exp $ + +EAPI=5 + +inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle + +MY_PN=VMware-Player +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P=${MY_PN}-${MY_PV}-${PV_BUILD} + +DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators +HOMEPAGE=http://www.vmware.com/products/player/; +BASE_URI=https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/; +SRC_URI= + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + + +LICENSE=vmware GPL-2 +SLOT=0 +KEYWORDS=-* ~amd64 +IUSE=cups doc +vmware-tools +RESTRICT=strip + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=dev-cpp/cairomm + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-cpp/libgnomecanvasmm:2.6 + dev-cpp/pangomm:1.4 + dev-libs/atk + dev-libs/glib:2 + dev-libs/libaio + dev-libs/libsigc++ + dev-libs/libxml2 + =dev-libs/openssl-0.9.8* + dev-libs/xmlrpc-c + gnome-base/libgnomecanvas + gnome-base/libgtop:2 + gnome-base/librsvg:2 + gnome-base/orbit + media-libs/fontconfig + media-libs/freetype + media-libs/libart_lgpl + =media-libs/libpng-1.2* + net-misc/curl + cups? ( net-print/cups ) + sys-devel/gcc + sys-fs/fuse + sys-libs/glibc + sys-libs/zlib + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/libgksu + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/, app-emulation/vmware-modules/, ...
commit: 02c8665f47034c0a00daa8851116c5b950dfc076 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Jul 14 01:21:11 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Jul 14 01:21:11 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=02c8665f adding missing files for version bump .../vmware-modules/vmware-modules-304.2.ebuild | 113 + app-emulation/vmware-workstation/Manifest | 1 + .../vmware-workstation/files/vmware-11.2.rc| 44 ++ .../vmware-workstation-11.1.2.2780323.ebuild | 497 + 4 files changed, 655 insertions(+) diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild new file mode 100644 index 000..5c4218e --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +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 +IUSE=pax_kernel +vmci +vsock + +RDEPEND= +DEPEND=${RDEPEND} + || ( =app-emulation/vmware-player-7.1.${PV_MINOR}* + =app-emulation/vmware-workstation-11.1.${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 + if use vmci ; then + CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI + else + CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI + fi + if use vsock ; then + CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS + else + CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS + fi + + linux-info_pkg_setup + + linux-mod_pkg_setup + + VMWARE_GROUP=${VMWARE_GROUP:-vmware} + + VMWARE_MODULE_LIST_ALL=vmblock vmmon vmnet vmci vsock + VMWARE_MODULE_LIST=vmblock vmmon vmnet + use vmci VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} vmci + use vsock VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} 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_ALL}; 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 + use pax_kernel epatch ${FILESDIR}/${PV_MAJOR}-hardened.patch + epatch ${FILESDIR}/${PV_MAJOR}-apic.patch + + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch + kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch + kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch + kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch + kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch + kernel_is ge 3 18 0 epatch ${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch + #kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch + #kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch + + # Allow user patches so they can support RC kernels and whatever else + epatch_user +} + +src_install() { + linux-mod_src_install + local udevrules=${T}/60-vmware.rules + cat ${udevrules} -EOF + KERNEL==vmci, GROUP=vmware, MODE=660 + KERNEL==vmw_vmci, GROUP=vmware, MODE=660 + KERNEL==vmmon, GROUP=vmware, MODE=660 + KERNEL
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/
commit: 19adc449de350954deb5037f52cff19243c1d198 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:49:58 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:49:58 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=19adc449 fixing udev rules needing some quotes Package-Manager: portage-2.2.20 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 6 +++--- app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 8 app-emulation/vmware-modules/vmware-modules-304.0.ebuild| 8 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 3158493..871704c 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -100,9 +100,9 @@ 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 + KERNEL==vmci, GROUP=vmware, MODE=660 + KERNEL==vmmon, GROUP=vmware, MODE=660 + KERNEL==vsock, GROUP=vmware, MODE=660 EOF udev_dorules ${udevrules} } diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild index 64a7d8a..327dbe2 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild @@ -107,10 +107,10 @@ src_install() { linux-mod_src_install local udevrules=${T}/60-vmware.rules cat ${udevrules} -EOF - KERNEL==vmci, GROUP=vmware, MODE=660 - KERNEL==vmw_vmci, GROUP=vmware, MODE=660 - KERNEL==vmmon, GROUP=vmware, MODE=660 - KERNEL==vsock, GROUP=vmware, MODE=660 + KERNEL==vmci, GROUP=vmware, MODE=660 + KERNEL==vmw_vmci, GROUP=vmware, MODE=660 + KERNEL==vmmon, GROUP=vmware, MODE=660 + KERNEL==vsock, GROUP=vmware, MODE=660 EOF udev_dorules ${udevrules} } diff --git a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild index e817e97..d972bb0 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild @@ -104,10 +104,10 @@ src_install() { linux-mod_src_install local udevrules=${T}/60-vmware.rules cat ${udevrules} -EOF - KERNEL==vmci, GROUP=vmware, MODE=660 - KERNEL==vmw_vmci, GROUP=vmware, MODE=660 - KERNEL==vmmon, GROUP=vmware, MODE=660 - KERNEL==vsock, GROUP=vmware, MODE=660 + KERNEL==vmci, GROUP=vmware, MODE=660 + KERNEL==vmw_vmci, GROUP=vmware, MODE=660 + KERNEL==vmmon, GROUP=vmware, MODE=660 + KERNEL==vsock, GROUP=vmware, MODE=660 EOF udev_dorules ${udevrules} }
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: 484feb2c895b9877e8e81f4d982a55df1d5bdcbf Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 03:56:45 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 03:56:45 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=484feb2c adding newer vmware tools too Package-Manager: portage-2.2.20 app-emulation/vmware-tools/Manifest| 6 +++ .../vmware-tools/vmware-tools-9.9.2.2496824.ebuild | 54 ++ 2 files changed, 60 insertions(+) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index c360c17..7305300 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -2,23 +2,29 @@ DIST vmware-tools-freebsd-9.6.2-1744117.i386.component.tar 15144960 SHA256 a9c7c DIST vmware-tools-freebsd-9.6.2-1744117.x86_64.component.tar 15144960 SHA256 1c6d4d21aa4ae8ba0c56f4b24fc8c73da07a4e8bfaf421b4db7c25012328fde1 SHA512 3306ccba195ed0373cf94e810fbb75f74f1b4238ed5be9bc50141222c2a5b687f79b794729ab40e192bba1c861670867abc792e54b01445b1bae8553eace2437 WHIRLPOOL 4556ea97c83ab3708316bd96e9e525fcf1a67c46bb2dd55c005e89102b2d4b8992d5a4376d79cc1c2faf20e65e08b8c3c79e26d9c9fd4c30d680a6ed184b9974 DIST vmware-tools-freebsd-9.6.4-2443746.i386.component.tar 15226880 SHA256 c821478c0f890a8de49674e4ca477b216b82136e7ea6c6d8cd77ea540947ec1b SHA512 b9156b1110d8fa6f821bfae173f3f52dd5c0fc747129941fd2884140a59a05752539bd664e34031055a2ac5002aa7f97e70765b9a9874227cb66530ee94f0ed5 WHIRLPOOL 6b2281a820ae64ee4bceef8b3fe85a76e569b73454b5e6df0a9e50e3fd89dc28f923fa3018fe6e3cec3f03f34099fb2f920dbb5ec6c0dbc0e4c222c550ce47fb DIST vmware-tools-freebsd-9.6.4-2443746.x86_64.component.tar 15226880 SHA256 18f4bf15d5337161090e140bc5fead2ee8a4d4ac0e7bada8f369eadd77065cd0 SHA512 8339a2d5ea8a6f752f486d3be56e41ebfc5fed46d44d933ade64806108a7c5264d5abb8f962b1b73106599b33c6d3d04f3bc071dd0014ffdf2e2c4e309449032 WHIRLPOOL 96e8c7705849abd575d01daaa18c1c2bf58f4072e758b23fef3541ae0655ba2638d89da44ea4f439b51aeef292d180150a3c51c2fcb50cf1f4a6667470531690 +DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f DIST vmware-tools-linux-9.6.2-1744117.i386.component.tar 61143040 SHA256 d84a4db83b1feb991b1a382b0936b864fc231dcc73c39304a16c34bb343e9f50 SHA512 7338a83330a62212559062e1c75f0540b7eb7f1037b7a32a9b8aba1750c9f53f2bb2c82c79147df93d93f9113b6902b3318ccd29d67d21ecb523f638d541c1e5 WHIRLPOOL 93213e870e99b71fc1dad344bd81acd61dd29a9fe853c37fa44408105d2be68e48ff044c56ad9dde8905ce7d42a614d585ab106ad1f9c5fea07f37fc2ba92526 DIST vmware-tools-linux-9.6.2-1744117.x86_64.component.tar 61143040 SHA256 ce07d8afe9c63dc8018979528d252413ea49f9330006fca7b9d9d1fb394dd2e4 SHA512 e5078b84a10ab0b6962ca175ae95475e89cda3f2cf94c0e077e012b7163f46f54a418f34439224b5cb41428f809359e053e36926e85cf17d2ef7a9dbed868b80 WHIRLPOOL 51186181d1ee9bf371e3d042d11baa16bf6627922ef9c967ab1a6c731763d50782787d0028978c5640ec7792f48072de3b2ece78bdfc30ad23a49352a4ea11d2 DIST vmware-tools-linux-9.6.4-2443746.i386.component.tar 61368320 SHA256 5eb335aa984091a75491053b7ad3f4e62dc970865241a3966cfa0a2930ef70ba SHA512 ca6b22837f808a9048747efd7a249bb96b1215af2dbf5eead6cb3e31172aad384aa73640e1634f31255b4853ee777a9b7a848eee616d4040a843745be0623e35 WHIRLPOOL 682afd5653a24b97d193c7f1eaa86cb8f2c2856089e983e04d1bc68c932e32d485aacdee68cc3ed409dc24e93fabc40b05b7ee58a9384ce30068b66363ec80b2 DIST vmware-tools-linux-9.6.4-2443746.x86_64.component.tar 61368320 SHA256 92bff31be9821532cabb346937dbf027a1939b93fc79892b6b1f8cc8db91d74d SHA512 5d03a0522d21257a02b3e09d2f73620066e95abb3c09a3640232261d40af2e496edcfbc52654b50bc84ac7e67d9862ae4fb8ca016bf24acfa74e0cd665bfb49e WHIRLPOOL 8dbdd8dc7a6cbfbfa8ab8c9a55111f543ee2c9d44364651f89bdec581efa65ee645f756e100d0453a5bc2d4dd83f1539822b37f7849b8362b43eeb5ebb80f184 +DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4 DIST vmware-tools-netware-9.6.2-1744117.i386.component.tar 81920 SHA256 1bcf7439f957d07fd84a56e6ab1bf88818759cf9f9a11df50ae5d0d65f0fd466 SHA512 9579e36b667af282ac3901ff4b836ba3fb1e74af81d19ac82fac94deb51d3bcf074e97ccb27bcab0cf8b9e319404c4cc305cea03ce08c6695191f89461c9de4a WHIRLPOOL
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: 47587654c3b2f0cdf73048c580a2d8d1e2217a31 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 04:10:21 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 04:10:21 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=47587654 fixing manifest? Package-Manager: portage-2.2.20 app-emulation/vmware-tools/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index 7305300..08cf570 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -27,4 +27,4 @@ DIST vmware-tools-windows-9.6.2-1744117.i386.component.tar 69283840 SHA256 f5f43 DIST vmware-tools-windows-9.6.2-1744117.x86_64.component.tar 69283840 SHA256 d4fe4f1d5137c577dd2b82eae855fe4fc021506eeaa8eaf77ef45f309331 SHA512 c3e40d7e2b10e6c318776d7fcef151c140fd20848de6d48d4a380ff8596b0c4889f8c46816bcacd6e3cdd815d0d8b868283714dba9e9095d94a7cd64da79dc80 WHIRLPOOL 0b1670d8ce585333755fccc72fa55bed6919645c5756917dfd96ccfd6a1eca9d9cd17c74f6458b38e8b9db0632668a33ff9b6d6724e4b01d185eaceff9f14e41 DIST vmware-tools-windows-9.6.4-2443746.i386.component.tar 69294080 SHA256 513e6be26e64b3896545a80074d9e08ff761ec3f15627a54d9bd974e8e24be9a SHA512 3f4dd1790fb7816973808f77ddac821231c9e6e750bc6c04c1600ea0a7c632c056590ee87164d38f49ffd5f647469cf5ee17b92113923f23a871a729fb69733d WHIRLPOOL 3826ac9350e36c332ed6fdc9a1af5ac57808c36915f907cc915004a78f574784cfc7abc9ac0ee7cb9f28973e355279b9f0ba66c52d3a8bd61cf94a3968a8e5d9 DIST vmware-tools-windows-9.6.4-2443746.x86_64.component.tar 69294080 SHA256 ffe3237ec7148afe437f31dde71fa92a3654502ee6de1a1106898dac111759d9 SHA512 c52798c6cd6c8664d40c865d7117ec8db9531871b3016f6a660ea3ecb1cc0612549c2364ad2eeb4be27b6905fb966a78aff28473e2ca4750a40c87c1ae2d3ad7 WHIRLPOOL 34c59a08a36de545ea38e1210a742305627cc73a20dc616d4a6cf6f6bddaa7886954811525fbdfc535133e3dd097906fe4787cdb0d616521cd638495a3729645 -DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 64699636 SHA256 8fdd13902a35633a358f937c87a98c21b36e08a876d2be2fdcabada53d62921f SHA512 3f53fb6dfa87a7f503869a11dd80de7a805cd60deee960040f0524747453a2ee0812bf164b58139acd75f042fa09df18322020865a0759e7dfb908fd17097b3d WHIRLPOOL 585c2415bf78cd0ac1a8e0c58c7619bda07a6aa7ccc76f6458270d48ca6d5d4fe7e3dc5ea608964ead574f26bcbf15216bf2d1a087720691f3b86cc8ee644a90 +DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 71485440 SHA256 3ef86f0bfce6f9396b4868d2fc067baa425cf9d1db2c4361dad81adb8fb02b69 SHA512 0c1df24026f96d160c3e3f4afac127d82f5ba1a4aabff4ca8fa64a60cde4b67b648601144d54a97bc760636bea1f9e71229b05bdc1c6d2959b3be93c1dc421eb WHIRLPOOL 090e49c1452987a77010e20f23f24f747e3158d4cc7ab6604d3fada16bb42410b34631c82d1580611bb7364faa1174108cce037ec4cc873821fe68e3d745cb3c
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: c8b1c812a25cbaa673e0fb40623d92642973c0a1 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:22:22 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:22:22 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c8b1c812 version bump for vmware-workstation 10 and 3.19/4.0 kernel support Package-Manager: portage-2.2.20 .../files/279-3.18-00-version-redefined.patch | 24 .../files/279-3.19-00-compat-namei.patch | 23 .../vmware-modules/files/279-3.19-01-dentry.patch | 13 + .../files/279-3.19-02-vmblock-path.patch | 67 ++ .../vmware-modules/files/279-3.19-03-iovec.patch | 19 ++ .../vmware-modules/files/279-3.19-04-iovec.patch | 39 + .../files/279-3.19-05-vmci_qpair.patch | 24 .../vmware-modules/files/279-3.19-06-vsock.patch | 15 + .../vmware-modules/files/279-3.19-07-vsock.patch | 12 ...es-279.5.ebuild = vmware-modules-279.6.ebuild} | 11 +++- .../vmware-modules/vmware-modules-304.0.ebuild | 35 +-- 11 files changed, 264 insertions(+), 18 deletions(-) diff --git a/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch new file mode 100644 index 000..2d38824 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch @@ -0,0 +1,24 @@ +--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.0 +0300 c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300 +@@ -53,7 +53,9 @@ + *VMware HD Audio codec + *VMware HD Audio controller + */ ++#ifndef PCI_VENDOR_ID_VMWARE + #define PCI_VENDOR_ID_VMWARE0x15AD ++#endif + #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 + #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 + #define PCI_DEVICE_ID_VMWARE_VGA0x0711 +--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.0 +0300 c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300 +@@ -53,7 +53,9 @@ + *VMware HD Audio codec + *VMware HD Audio controller + */ ++#ifndef PCI_VENDOR_ID_VMWARE + #define PCI_VENDOR_ID_VMWARE0x15AD ++#endif + #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 + #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 + #define PCI_DEVICE_ID_VMWARE_VGA0x0711 diff --git a/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch new file mode 100644 index 000..ec73500 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch @@ -0,0 +1,23 @@ +--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.0 +0300 c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300 +@@ -21,6 +21,20 @@ + + #include linux/namei.h + ++/* Copy-n-paste from kernel's source/fs/namei.c */ ++struct nameidata { ++ struct path path; ++ struct qstr last; ++ struct path root; ++ struct inode*inode; /* path.dentry.d_inode */ ++ unsigned intflags; ++ unsignedseq, m_seq; ++ int last_type; ++ unsigneddepth; ++ struct file *base; ++ char *saved_names[MAX_NESTED_LINKS + 1]; ++}; ++ + /* + * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata + * struct. They were both replaced with a struct path. diff --git a/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch new file mode 100644 index 000..6f11a52 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch @@ -0,0 +1,13 @@ +--- a/vmnet-only/driver.c 2015-02-07 03:54:17.0 +0300 c/vmnet-only/driver.c 2015-02-24 03:58:06.043605137 +0300 +@@ -1191,8 +1191,8 @@ +struct inode *inode = NULL; +long err; + +- if (filp filp-f_dentry) { +- inode = filp-f_dentry-d_inode; ++ if (filp filp-f_path.dentry) { ++ inode = filp-f_path.dentry-d_inode; +} +err = VNetFileOpIoctl(inode, filp, iocmd, ioarg); +return err; diff --git a/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch new file mode 100644 index 000..178d147 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch @@ -0,0 +1,67 @@ +Sources: +https://531682.bugs.gentoo.org/attachment.cgi?id=396484 +https://531682.bugs.gentoo.org/attachment.cgi?id=396482 +diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c +--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.0 -0500
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/
commit: 14359636e43aaa9893e110fab2848e2f189fd0e5 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:24:49 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:24:49 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=14359636 version bump for tools Package-Manager: portage-2.2.20 app-emulation/vmware-tools/Manifest| 12 + .../vmware-tools/vmware-tools-9.6.5.2700073.ebuild | 55 ++ 2 files changed, 67 insertions(+) diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest index 08cf570..547040f 100644 --- a/app-emulation/vmware-tools/Manifest +++ b/app-emulation/vmware-tools/Manifest @@ -2,29 +2,41 @@ DIST vmware-tools-freebsd-9.6.2-1744117.i386.component.tar 15144960 SHA256 a9c7c DIST vmware-tools-freebsd-9.6.2-1744117.x86_64.component.tar 15144960 SHA256 1c6d4d21aa4ae8ba0c56f4b24fc8c73da07a4e8bfaf421b4db7c25012328fde1 SHA512 3306ccba195ed0373cf94e810fbb75f74f1b4238ed5be9bc50141222c2a5b687f79b794729ab40e192bba1c861670867abc792e54b01445b1bae8553eace2437 WHIRLPOOL 4556ea97c83ab3708316bd96e9e525fcf1a67c46bb2dd55c005e89102b2d4b8992d5a4376d79cc1c2faf20e65e08b8c3c79e26d9c9fd4c30d680a6ed184b9974 DIST vmware-tools-freebsd-9.6.4-2443746.i386.component.tar 15226880 SHA256 c821478c0f890a8de49674e4ca477b216b82136e7ea6c6d8cd77ea540947ec1b SHA512 b9156b1110d8fa6f821bfae173f3f52dd5c0fc747129941fd2884140a59a05752539bd664e34031055a2ac5002aa7f97e70765b9a9874227cb66530ee94f0ed5 WHIRLPOOL 6b2281a820ae64ee4bceef8b3fe85a76e569b73454b5e6df0a9e50e3fd89dc28f923fa3018fe6e3cec3f03f34099fb2f920dbb5ec6c0dbc0e4c222c550ce47fb DIST vmware-tools-freebsd-9.6.4-2443746.x86_64.component.tar 15226880 SHA256 18f4bf15d5337161090e140bc5fead2ee8a4d4ac0e7bada8f369eadd77065cd0 SHA512 8339a2d5ea8a6f752f486d3be56e41ebfc5fed46d44d933ade64806108a7c5264d5abb8f962b1b73106599b33c6d3d04f3bc071dd0014ffdf2e2c4e309449032 WHIRLPOOL 96e8c7705849abd575d01daaa18c1c2bf58f4072e758b23fef3541ae0655ba2638d89da44ea4f439b51aeef292d180150a3c51c2fcb50cf1f4a6667470531690 +DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdf455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b +DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b5c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f DIST vmware-tools-linux-9.6.2-1744117.i386.component.tar 61143040 SHA256 d84a4db83b1feb991b1a382b0936b864fc231dcc73c39304a16c34bb343e9f50 SHA512 7338a83330a62212559062e1c75f0540b7eb7f1037b7a32a9b8aba1750c9f53f2bb2c82c79147df93d93f9113b6902b3318ccd29d67d21ecb523f638d541c1e5 WHIRLPOOL 93213e870e99b71fc1dad344bd81acd61dd29a9fe853c37fa44408105d2be68e48ff044c56ad9dde8905ce7d42a614d585ab106ad1f9c5fea07f37fc2ba92526 DIST vmware-tools-linux-9.6.2-1744117.x86_64.component.tar 61143040 SHA256 ce07d8afe9c63dc8018979528d252413ea49f9330006fca7b9d9d1fb394dd2e4 SHA512 e5078b84a10ab0b6962ca175ae95475e89cda3f2cf94c0e077e012b7163f46f54a418f34439224b5cb41428f809359e053e36926e85cf17d2ef7a9dbed868b80 WHIRLPOOL 51186181d1ee9bf371e3d042d11baa16bf6627922ef9c967ab1a6c731763d50782787d0028978c5640ec7792f48072de3b2ece78bdfc30ad23a49352a4ea11d2 DIST vmware-tools-linux-9.6.4-2443746.i386.component.tar 61368320 SHA256 5eb335aa984091a75491053b7ad3f4e62dc970865241a3966cfa0a2930ef70ba SHA512 ca6b22837f808a9048747efd7a249bb96b1215af2dbf5eead6cb3e31172aad384aa73640e1634f31255b4853ee777a9b7a848eee616d4040a843745be0623e35 WHIRLPOOL 682afd5653a24b97d193c7f1eaa86cb8f2c2856089e983e04d1bc68c932e32d485aacdee68cc3ed409dc24e93fabc40b05b7ee58a9384ce30068b66363ec80b2 DIST vmware-tools-linux-9.6.4-2443746.x86_64.component.tar 61368320 SHA256 92bff31be9821532cabb346937dbf027a1939b93fc79892b6b1f8cc8db91d74d SHA512 5d03a0522d21257a02b3e09d2f73620066e95abb3c09a3640232261d40af2e496edcfbc52654b50bc84ac7e67d9862ae4fb8ca016bf24acfa74e0cd665bfb49e WHIRLPOOL
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/
commit: 60ff08ada503c9d104094ede2c49f337ef502cb5 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:26:18 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:26:18 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=60ff08ad version bump for workstation 10 app-emulation/vmware-workstation/Manifest | 2 + .../vmware-workstation-10.0.6.2700073.ebuild | 499 + 2 files changed, 501 insertions(+) diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 69b6166..087a7ad 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -2,5 +2,7 @@ DIST VMware-Workstation-10.0.2-1744117.i386.bundle.tar 283658240 SHA256 3b8fcdf6 DIST VMware-Workstation-10.0.2-1744117.x86_64.bundle.tar 254115840 SHA256 95986090a4f2f59ae551a63a78f9ff5bdc3a87c48b25b10abb754720c3581f02 SHA512 69ede2f67e3283a3b234605ca5aa0da008917d6b329ab6ca27f578620b6268ec79622b4fc5c33f527fcac917dd78a844ad2ff4bbd0149aa4dbb7755d WHIRLPOOL 42117a4bb6184629ec2e8c13c39f3298c746a4fa10b0928cee3ccd1c3e4464af95f59c7ff0f71c44184d25cc91e593cbb40fd050275ee1e66b308010fc907a17 DIST VMware-Workstation-10.0.5-2443746.i386.bundle.tar 283392000 SHA256 993af797b37fcd86345f509b92a64e8425ddeab76d730dfe3a0ddbf42be583c8 SHA512 f1d1d3b293d69f1b0727272c6f2437ad33642e9f96a098057cbcc85e8d63cdd03d440aa1dee199ab7ee9f1255b69821bdb93d2d2b6dd86f6e4b4110bb50631a9 WHIRLPOOL 139e6005ffb2a839d4ce3588280ed2e5fb8b36061fb3a8868695131805e6aaac462474ba3b38eca653dacc3552acf8fb40aed97d2dd272c18230c3c461d0b479 DIST VMware-Workstation-10.0.5-2443746.x86_64.bundle.tar 254208000 SHA256 4c8edbc4936977e36dfdcb4e6f4efb3ad0d2d4b8586c82562f3122fc0c1f3b06 SHA512 73265b4c2e88578b132eb67c985b9e12e9bf34af7c5d23060cd8596123bee82da9e3a27ca63477cbf467185767b93a71392a4d1c493be6f1a9303bed2601631c WHIRLPOOL 333e7fafb753740a990b395340a646bad1062ba30cae92f98c81281012f4d2713ed4ae9fb0ce98361d142a69148cc644637d61241e583a391c524a2c18f54ae3 +DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26ba33027344a943734e48cac03ed522a9cf09131837758af3ebd27ea60 SHA512 f65ce16784c9fccb0a6f09abe52bbbe1cc1567d366d03cfe0f79fdfbf4b9d5fef8238a6f62e969b8415112bf063f3d6a5e66239aa89159172520c80efd90c7e9 WHIRLPOOL 11ffae3b8a7e059e63afd2a8a19f9a07d8d63d2ef8f83c623b37e315750b09cb9a31537125614610fc988184017fe45b3ae5408670257c1dc9531dd6b6b17717 +DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa DIST VMware-Workstation-11.1.0-2496824.x86_64.bundle.tar 259112960 SHA256 bad9d8e223a2d7be07965c6dfc1dc450c996d4d447c500a7c874b85fc731d6c1 SHA512 78de89be8943f8ee99fae048047047f98ae44ee3bbb6dabd550726af864c61b0824a72b5ad91120cab0115d91fa036908d182518fcbd1b68b9a78caeb18ebc33 WHIRLPOOL 77807b5139eef194233bca608c888cec81a40b3fda1c08fb31a39bd24133ac58f700b6b84fd50207b9a47184a72a86e00cf00c74b13523c05b069b3dc089b34b DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild new file mode 100644 index 000..0b66844 --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild @@ -0,0 +1,499 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle + +MY_PN=VMware-Workstation +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P=${MY_PN}-${MY_PV}-${PV_BUILD} + +SYSTEMD_UNITS_TAG=gentoo-01 + +DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators +HOMEPAGE=http://www.vmware.com/products/workstation/; +BASE_URI=https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/; +SRC_URI= + x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz + +LICENSE=vmware GPL-2 +SLOT=0
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/
commit: ca15889876e473fa2aed0de9a0a6cb26c7c669bc Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:23:17 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:23:17 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=ca158898 adding the player that matches workstation 11 Package-Manager: portage-2.2.20 app-emulation/vmware-player/Manifest | 3 + .../vmware-player-6.0.6.2700073.ebuild | 245 + .../vmware-player-7.1.0.2496824.ebuild | 244 3 files changed, 492 insertions(+) diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index 65d7b3e..a9dddbd 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,2 +1,5 @@ DIST VMware-Player-6.0.2-1744117.i386.bundle.tar 233226240 SHA256 b3314b1b4658fff3a3bd821381e141b4039bc6925088d509f073dfdc19f78937 SHA512 da912c898306a50392cdf814f523321962e70d6d2afabe2cbcec35e581c60d1ba3e28fdf11f4e83306c9057038a7ab8d1d1e2e4281068fdb9997f6d1aaf34e74 WHIRLPOOL bdd81a3620a56a689f48443d8cb0fc5dbde8ec5d996fcff5e38a983eb4fa5d6bfb73658f1b15837f6c4272578b4f90875f9393db3318ee9ad84cf1266fbcbed5 DIST VMware-Player-6.0.2-1744117.x86_64.bundle.tar 200560640 SHA256 6e8ef0982303128fe2d41f59cc6d4031edcc85f4dcc8ba20e17df9837a4c972f SHA512 8e71b59e5152ec6a21e2bc87e11462fbc9f25a27ea48e73ace6daa198bc75fb0cf49d895755abe10b3fb52df0ec0586fd00e8bd51c461b7a638e745c6bbd996e WHIRLPOOL a9af879ce290a9f0ac2fb5f6af425e509455d6fb553156250013a941e782c416435be7326498ed544ee81623fbac4a5924940cc05dd56325c0d8e4c71c44b0b8 +DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59eb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf +DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88 +DIST VMware-Player-7.1.0-2496824.x86_64.bundle.tar 211077120 SHA256 80259e2b9337d4193da27109634fcb112e40241038f6956fa0e4e3b2f19900af SHA512 28f51f5b167fee8ad3c77fc3c36b0bb084e9f7e891f29952293f5857dcc1e03427d8db33a013abd64145293e19866f3c7d61e6e0d008eb94a1a349e9e8176459 WHIRLPOOL bca1a430a33914c004ddaaf13788ec26fa859a959f017c85b398f72c8b9af2da58c2f96c3d4034ab2d18aded07a304b4d30291eb422e692baefc833e47aec430 diff --git a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild new file mode 100644 index 000..f859e7f --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild,v 1.1 2014/04/19 15:01:08 dilfridge Exp $ + +EAPI=5 + +inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle + +MY_PN=VMware-Player +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P=${MY_PN}-${MY_PV}-${PV_BUILD} + +DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators +HOMEPAGE=http://www.vmware.com/products/player/; +BASE_URI=https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/; +SRC_URI= + x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + + +LICENSE=vmware GPL-2 +SLOT=0 +KEYWORDS=-* ~amd64 ~x86 +IUSE=cups doc +vmware-tools +RESTRICT=strip + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=dev-cpp/cairomm + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-cpp/libgnomecanvasmm:2.6 + dev-cpp/pangomm:1.4 + dev-libs/atk + dev-libs/glib:2 + dev-libs/libaio + dev-libs/libsigc++ + dev-libs/libxml2 + =dev-libs/openssl-0.9.8* + dev-libs/xmlrpc-c + gnome-base/libgnomecanvas + gnome-base/libgtop:2 + gnome-base/librsvg:2 + gnome-base/orbit + media-libs/fontconfig + media-libs/freetype + media-libs/libart_lgpl + =media-libs/libpng-1.2* + net-misc/curl + cups? ( net-print/cups ) + sys-devel/gcc
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-vsphere-cli/, app-emulation/vmware-tools/, ...
commit: c6806c18ed8405e0315c82e457a6d9cfc3162740 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 08:37:42 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 08:37:42 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c6806c18 cleaning out ebuilds replaced by newer verions (last release was a security patch, so fairly important that we don't new installs of old versions i presume?) fixed up dependancies of vmware-vsphere ebuild to please repoman :-P Package-Manager: portage-2.2.20 .../vmware-modules/vmware-modules-279.2-r1.ebuild | 107 - .../vmware-modules/vmware-modules-279.3-r1.ebuild | 107 - app-emulation/vmware-player/Manifest | 2 - .../vmware-player-6.0.2.1744117.ebuild | 245 -- app-emulation/vmware-tools/Manifest| 24 - .../vmware-tools/vmware-tools-9.6.2.1744117.ebuild | 55 --- .../vmware-tools/vmware-tools-9.6.4.2443746.ebuild | 55 --- .../vmware-vsphere-cli-4.1.0.254719-r1.ebuild | 6 +- app-emulation/vmware-workstation/Manifest | 4 - .../vmware-workstation-10.0.2.1744117.ebuild | 493 .../vmware-workstation-10.0.5.2443746.ebuild | 499 - 11 files changed, 3 insertions(+), 1594 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild deleted file mode 100644 index bf8e379..000 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $ - -EAPI=5 - -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 +vmci +vsock - -RDEPEND= -DEPEND=${RDEPEND} - || ( =app-emulation/vmware-player-6.0.${PV_MINOR}* - =app-emulation/vmware-workstation-10.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 - if use vmci ; then - CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI - else - CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI - fi - if use vsock ; then - CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS - else - CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS - fi - - linux-info_pkg_setup - - linux-mod_pkg_setup - - VMWARE_GROUP=${VMWARE_GROUP:-vmware} - - VMWARE_MODULE_LIST_ALL=vmblock vmmon vmnet vmci vsock - VMWARE_MODULE_LIST=vmblock vmmon vmnet - use vmci VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} vmci - use vsock VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} 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_ALL}; 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 - use pax_kernel epatch ${FILESDIR}/279-hardened.patch - epatch ${FILESDIR}/${PV_MAJOR}-apic.patch - kernel_is ge 3 7 0 epatch ${FILESDIR}/${PV_MAJOR}-putname.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-vmblock.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch - kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch - kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch - kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch - kernel_is ge 3 17 0 epatch ${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch - - # Allow user patches so they can support RC
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: b5fe5509592d54689ed4c4eb0633507bcda8219b Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 03:47:43 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 03:47:43 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=b5fe5509 adding some minor patches that were applied to previous versions probably not 100% necessary, but they don't hurt either Package-Manager: portage-2.2.20 app-emulation/vmware-modules/files/304-apic.patch | 12 +++ .../vmware-modules/files/304-hardened.patch| 113 + .../vmware-modules/files/304-netdevice.patch | 24 + .../vmware-modules/vmware-modules-304.0.ebuild | 4 + 4 files changed, 153 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-apic.patch b/app-emulation/vmware-modules/files/304-apic.patch new file mode 100644 index 000..66cd459 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-apic.patch @@ -0,0 +1,12 @@ +diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +index f1f4b10..c43242f 100644 +--- a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +@@ -55,6 +55,7 @@ + #include linux/kthread.h + #include linux/wait.h + ++#include asm/apic.h + + #include vmware.h + #include x86apic.h diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch new file mode 100644 index 000..cc3e041 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-hardened.patch @@ -0,0 +1,113 @@ +diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c +index b21dd44..960c2aa 100644 +--- a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c +@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { + #endif + }; + +-static struct file_operations vmuser_fops; ++static struct file_operations vmuser_fops = { ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, ++#else ++ .ioctl = LinuxDriver_Ioctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = LinuxDriver_UnlockedIoctl, ++#endif ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close, ++ .mmap = LinuxDriverMmap ++}; ++ + static struct timer_list tscTimer; + + /* +@@ -357,27 +372,6 @@ init_module(void) +spin_lock_init(linuxState.pollListLock); + #endif + +- /* +-* Initialize the file_operations structure. Because this code is always +-* compiled as a module, this is fine to do it here and not in a static +-* initializer. +-*/ +- +- memset(vmuser_fops, 0, sizeof vmuser_fops); +- vmuser_fops.owner = THIS_MODULE; +- vmuser_fops.poll = LinuxDriverPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; +-#else +- vmuser_fops.ioctl = LinuxDriver_Ioctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; +-#endif +- vmuser_fops.open = LinuxDriver_Open; +- vmuser_fops.release = LinuxDriver_Close; +- vmuser_fops.mmap = LinuxDriverMmap; +- + #ifdef VMX86_DEVEL +devel_init_module(); +linuxState.minor = 0; +diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c +index b12b982..40bd4cf 100644 +--- a/vmnet-only/driver.c b/vmnet-only/driver.c +@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, + unsigned int iocmd, unsigned long ioarg); + #endif + +-static struct file_operations vnetFileOps; ++static struct file_operations vnetFileOps = { ++ .owner = THIS_MODULE, ++ .read = VNetFileOpRead, ++ .write = VNetFileOpWrite, ++ .poll = VNetFileOpPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = VNetFileOpUnlockedIoctl, ++#else ++ .ioctl = VNetFileOpIoctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = VNetFileOpUnlockedIoctl, ++#endif ++ .open = VNetFileOpOpen, ++ .release = VNetFileOpClose ++}; + + /* + * Utility functions +@@ -476,28 +491,6 @@ init_module(void) + goto err_proto; +} + +- /* +-* Initialize the file_operations structure. Because this code is always +-* compiled as a module, this is fine to do it here and not in a static +-* initializer. +-*/ +- +- memset(vnetFileOps, 0, sizeof vnetFileOps); +- vnetFileOps.owner = THIS_MODULE; +- vnetFileOps.read = VNetFileOpRead; +- vnetFileOps.write = VNetFileOpWrite; +- vnetFileOps.poll = VNetFileOpPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; +-#else +- vnetFileOps.ioctl = VNetFileOpIoctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; +-#endif +- vnetFileOps.open = VNetFileOpOpen; +- vnetFileOps.release = VNetFileOpClose; +- +retval = register_chrdev(VNET_MAJOR_NUMBER, vmnet, vnetFileOps); +if (retval) { + LOG(0, (KERN_NOTICE /dev/vmnet: could
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 9c26a3fe09dc2b49b046b2097248ce3d6c60075e Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 03:21:27 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 03:21:27 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=9c26a3fe working on vmware-workstation 11 support :-) Package-Manager: portage-2.2.20 .../vmware-modules/files/304-3.10-00-dentry.patch | 42 .../vmware-modules/files/304-3.10-01-inode.patch | 91 + .../vmware-modules/files/304-3.10-02-control.patch | 55 +++ .../vmware-modules/files/304-3.10-03-inline.patch | 13 +++ .../vmware-modules/files/304-3.11-00-readdir.patch | 41 .../vmware-modules/files/304-3.11-01-filldir.patch | 53 ++ .../vmware-modules/files/304-3.15-00-vsock.patch | 46 + .../files/304-3.18-00-version-redefined.patch | 24 + .../files/304-3.19-00-compat-namei.patch | 23 + .../vmware-modules/files/304-3.19-01-dentry.patch | 13 +++ .../files/304-3.19-02-vmblock-path.patch | 67 + .../vmware-modules/files/304-3.19-03-iovec.patch | 19 .../vmware-modules/files/304-3.19-04-iovec.patch | 58 +++ .../files/304-3.19-05-vmci_qpair.patch | 24 + .../vmware-modules/files/304-3.19-06-vsock.patch | 15 +++ .../vmware-modules/files/304-3.19-07-vsock.patch | 12 +++ .../files/304-makefile-include.patch | 65 + .../files/304-makefile-kernel-dir.patch| 85 .../vmware-modules/vmware-modules-304.0.ebuild | 108 + 19 files changed, 854 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch new file mode 100644 index 000..a0bb8b8 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch @@ -0,0 +1,42 @@ +--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.0 +0300 c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300 +@@ -32,7 +32,11 @@ + #include block.h + + ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 10, 0) + static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd); ++#else ++static int DentryOpRevalidate(struct dentry *dentry, unsigned int); ++#endif + + struct dentry_operations LinkDentryOps = { +.d_revalidate = DentryOpRevalidate, +@@ -58,9 +62,12 @@ + * + */ + +-static int +-DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating +- struct nameidata *nd) // IN: lookup flags intent ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 10, 0) ++static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd) ++#else ++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags) ++#endif ++ + { +VMBlockInodeInfo *iinfo; +struct nameidata actualNd; +@@ -101,7 +108,11 @@ +if (actualDentry +actualDentry-d_op +actualDentry-d_op-d_revalidate) { ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 10, 0) ++ return actualDentry-d_op-d_revalidate(actualDentry, flags); ++#else + return actualDentry-d_op-d_revalidate(actualDentry, nd); ++#endif +} + +if (compat_path_lookup(iinfo-name, 0, actualNd)) { diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch new file mode 100644 index 000..cf4ccd9 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch @@ -0,0 +1,91 @@ +--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.0 +0300 c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300 +@@ -35,9 +35,15 @@ + + + /* Inode operations */ +-static struct dentry *InodeOpLookup(struct inode *dir, +-struct dentry *dentry, struct nameidata *nd); ++ ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 10, 0) ++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd); + static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); ++#else ++static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int); ++static int InodeOpReadlink(struct dentry *, char __user *, int); ++#endif ++ + #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else +@@ -49,12 +55,15 @@ +.lookup = InodeOpLookup, + }; + ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 13, 0) + static struct inode_operations LinkInodeOps = { ++#else ++struct inode_operations LinkInodeOps = { ++#endif +.readlink= InodeOpReadlink, +.follow_link = InodeOpFollowlink
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/
commit: 37995188eb8033a27494e53505bc3d2aaed3e2da Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 03:22:17 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 03:22:17 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=37995188 ebuild for vmware workstation 11.1 shoudl work on kernels 3.10 - 4.0 Package-Manager: portage-2.2.20 app-emulation/vmware-workstation/Manifest | 1 + .../vmware-workstation/files/vmware-11.0.rc| 44 ++ .../vmware-workstation-11.1.0.2496824.ebuild | 497 + 3 files changed, 542 insertions(+) diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index ac896a7..69b6166 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -2,4 +2,5 @@ DIST VMware-Workstation-10.0.2-1744117.i386.bundle.tar 283658240 SHA256 3b8fcdf6 DIST VMware-Workstation-10.0.2-1744117.x86_64.bundle.tar 254115840 SHA256 95986090a4f2f59ae551a63a78f9ff5bdc3a87c48b25b10abb754720c3581f02 SHA512 69ede2f67e3283a3b234605ca5aa0da008917d6b329ab6ca27f578620b6268ec79622b4fc5c33f527fcac917dd78a844ad2ff4bbd0149aa4dbb7755d WHIRLPOOL 42117a4bb6184629ec2e8c13c39f3298c746a4fa10b0928cee3ccd1c3e4464af95f59c7ff0f71c44184d25cc91e593cbb40fd050275ee1e66b308010fc907a17 DIST VMware-Workstation-10.0.5-2443746.i386.bundle.tar 283392000 SHA256 993af797b37fcd86345f509b92a64e8425ddeab76d730dfe3a0ddbf42be583c8 SHA512 f1d1d3b293d69f1b0727272c6f2437ad33642e9f96a098057cbcc85e8d63cdd03d440aa1dee199ab7ee9f1255b69821bdb93d2d2b6dd86f6e4b4110bb50631a9 WHIRLPOOL 139e6005ffb2a839d4ce3588280ed2e5fb8b36061fb3a8868695131805e6aaac462474ba3b38eca653dacc3552acf8fb40aed97d2dd272c18230c3c461d0b479 DIST VMware-Workstation-10.0.5-2443746.x86_64.bundle.tar 254208000 SHA256 4c8edbc4936977e36dfdcb4e6f4efb3ad0d2d4b8586c82562f3122fc0c1f3b06 SHA512 73265b4c2e88578b132eb67c985b9e12e9bf34af7c5d23060cd8596123bee82da9e3a27ca63477cbf467185767b93a71392a4d1c493be6f1a9303bed2601631c WHIRLPOOL 333e7fafb753740a990b395340a646bad1062ba30cae92f98c81281012f4d2713ed4ae9fb0ce98361d142a69148cc644637d61241e583a391c524a2c18f54ae3 +DIST VMware-Workstation-11.1.0-2496824.x86_64.bundle.tar 259112960 SHA256 bad9d8e223a2d7be07965c6dfc1dc450c996d4d447c500a7c874b85fc731d6c1 SHA512 78de89be8943f8ee99fae048047047f98ae44ee3bbb6dabd550726af864c61b0824a72b5ad91120cab0115d91fa036908d182518fcbd1b68b9a78caeb18ebc33 WHIRLPOOL 77807b5139eef194233bca608c888cec81a40b3fda1c08fb31a39bd24133ac58f700b6b84fd50207b9a47184a72a86e00cf00c74b13523c05b069b3dc089b34b DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc new file mode 100644 index 000..2a827bc --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + + # quiet for vmci because it may not be there + modprobe -vq vmci || modprobe -v vmw_vmci + eend $? + + # vmci or vmw_vmci was loaded by the previous modprobe + # no need to do it here + modprobe -av vmmon vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + + # quiet for vmci because it may not be there + modprobe -rvq vmci || modprobe -rv vmw_vmci + eend $? +} diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild new file mode 100644 index 000..c54501b --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild @@ -0,0 +1,497 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/
commit: 5d33bc7ab62b28de4d7bd438c6882e831f2fb6f2 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Mon Jul 6 03:32:25 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Mon Jul 6 03:32:25 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=5d33bc7a fixing init script name Package-Manager: portage-2.2.20 app-emulation/vmware-workstation/files/{vmware-11.0.rc = vmware-11.1.rc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.1.rc similarity index 100% rename from app-emulation/vmware-workstation/files/vmware-11.0.rc rename to app-emulation/vmware-workstation/files/vmware-11.1.rc
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: cb645967849017b215d6a47818549c8c999a640e Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu May 7 00:56:12 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu May 7 00:56:12 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=cb645967 trying to fix vsock's usage of VMCI interface, previous patch compiled... but was broken as demonstrated by trying to do a VMWARE automatted install. This new patch looks better but needs to be tested .../files/271-3.19-06-vmci_qpair.patch | 24 +++ .../vmware-modules/files/271-3.19-06-vsock.patch | 36 -- .../vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch new file mode 100644 index 000..1849a37 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch @@ -0,0 +1,24 @@ +diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c +--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400 vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400 +@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio +* able to send. +*/ + +- written = vmci_qpair_enquev(vsk-qpair, msg-msg_iov, ++ written = vmci_qpair_enquev(vsk-qpair, msg-msg_iter.iov, + len - totalWritten, 0); + if (written 0) { + err = -ENOMEM; +@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio + } + + if (flags MSG_PEEK) { +-read = vmci_qpair_peekv(vsk-qpair, msg-msg_iov, len - copied, 0); ++read = vmci_qpair_peekv(vsk-qpair, msg-msg_iter.iov, len - copied, 0); + } else { +-read = vmci_qpair_dequev(vsk-qpair, msg-msg_iov, len - copied, 0); ++read = vmci_qpair_dequev(vsk-qpair, msg-msg_iter.iov, len - copied, 0); + } + + if (read 0) { diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch deleted file mode 100644 index a2b0136..000 --- a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c vsock-only/linux/af_vsock.c2015-05-05 11:51:59.794166063 -0400 -+++ vsock-only.new/linux/af_vsock.c2015-05-05 11:53:38.621171420 -0400 -@@ -4874,9 +4874,11 @@ VSockVmciStreamRecvmsg(struct kiocb *kio - } - - if (flags MSG_PEEK) { --read = vmci_qpair_peekv(vsk-qpair, msg-msg_iov, len - copied, 0); -+ struct iovec iov = iov_iter_iovec(msg-msg_iter); -+read = vmci_qpair_peekv(vsk-qpair, iov, len - copied, 0); - } else { --read = vmci_qpair_dequev(vsk-qpair, msg-msg_iov, len - copied, 0); -+ struct iovec iov = iov_iter_iovec(msg-msg_iter); -+read = vmci_qpair_dequev(vsk-qpair, iov, len - copied, 0); - } - - if (read 0) { -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c vsock-only/linux/af_vsock.c2015-05-05 11:53:59.937172575 -0400 -+++ vsock-only.new/linux/af_vsock.c2015-05-05 11:59:25.824190240 -0400 -@@ -4628,9 +4628,12 @@ VSockVmciStreamSendmsg(struct kiocb *kio -* size. It is the caller's responsibility to check how many bytes we were -* able to send. -*/ -- -- written = vmci_qpair_enquev(vsk-qpair, msg-msg_iov, -- len - totalWritten, 0); -+ { -+struct iovec iov = iov_iter_iovec(msg-msg_iter); -+ written = vmci_qpair_enquev(vsk-qpair, iov, -+ len - totalWritten, 0); -+ } -+ - if (written 0) { - err = -ENOMEM; - goto outWait; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 66c0b2b..3158493 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -90,7 +90,7 @@ src_prepare() { kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-03-vmnet.patch kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-04-vsock.patch kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-05-vsock.patch - kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch + kernel_is ge 3 19 0 epatch ${FILESDIR}/${PV_MAJOR}-3.19-06-vmci_qpair.patch # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: 633505a21b03a51abaee1d90875693741cdb119e Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue May 5 17:09:16 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue May 5 17:09:16 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=633505a2 looks like this patch was missing a portion, my bad Package-Manager: portage-2.2.18 .../vmware-modules/files/271-3.19-01-vmblock-path.patch | 15 +++ 1 file changed, 15 insertions(+) diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch index 4bf17e1..178d147 100644 --- a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch +++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch @@ -1,3 +1,6 @@ +Sources: +https://531682.bugs.gentoo.org/attachment.cgi?id=396484 +https://531682.bugs.gentoo.org/attachment.cgi?id=396482 diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c --- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.0 -0500 +++ vmblock-only/linux/dentry.c2015-02-14 18:09:59.0 -0500 @@ -50,3 +53,15 @@ diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_na #else #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd) #endif +diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c +--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.0 -0500 vmblock-only/linux/file.c 2015-02-11 12:41:41.0 -0500 +@@ -92,7 +92,7 @@ + * and that would try to acquire the inode's semaphore; if the two inodes + * are the same we'll deadlock. + */ +- if (actualFile-f_dentry inode == actualFile-f_dentry-d_inode) { ++ if (actualFile-f_path.dentry inode == actualFile-f_path.dentry-d_inode) { + Warning(FileOpOpen: identical inode encountered, open cannot succeed.\n); + if (filp_close(actualFile, current-files) 0) { + Warning(FileOpOpen: unable to close opened file.\n);
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 92cecf1dbaab4333b53269e65ecbee15d9b866b0 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue May 5 16:42:05 2015 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue May 5 16:42:05 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92cecf1d 271 should now compile (and I beleive function correctly) on 3.19 I'll look into 4.x soon Package-Manager: portage-2.2.18 .../files/271-3.19-00-vmnet-warning.patch | 13 ++ .../files/271-3.19-01-vmblock-path.patch | 52 ++ .../vmware-modules/files/271-3.19-02-vmci.patch| 29 .../vmware-modules/files/271-3.19-03-vmnet.patch | 29 .../vmware-modules/files/271-3.19-04-vsock.patch | 12 + .../vmware-modules/files/271-3.19-05-vsock.patch | 15 +++ .../vmware-modules/files/271-3.19-06-vsock.patch | 36 +++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 10 - 8 files changed, 195 insertions(+), 1 deletion(-) diff --git a/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch new file mode 100644 index 000..b4d30c9 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch @@ -0,0 +1,13 @@ +diff -rupN vmnet-only/vm_device_version.h vmnet-only.new/vm_device_version.h +--- vmnet-only/vm_device_version.h 2013-11-06 00:40:52.0 -0500 vmnet-only.new/vm_device_version.h 2015-05-05 12:03:06.879202223 -0400 +@@ -53,7 +53,9 @@ + *VMware HD Audio codec + *VMware HD Audio controller + */ ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 19, 0) + #define PCI_VENDOR_ID_VMWARE0x15AD ++#endif + #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 + #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 + #define PCI_DEVICE_ID_VMWARE_NET0x0720 diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch new file mode 100644 index 000..4bf17e1 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch @@ -0,0 +1,52 @@ +diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c +--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.0 -0500 vmblock-only/linux/dentry.c2015-02-14 18:09:59.0 -0500 +@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry +unsigned int flags) // IN: lookup flags intent + { +VMBlockInodeInfo *iinfo; +- struct nameidata actualNd; ++ struct path actualNd; +struct dentry *actualDentry; +int ret; + +diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c +--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.0 -0500 vmblock-only/linux/filesystem.c2015-02-14 18:10:49.0 -0500 +@@ -322,7 +322,7 @@ Iget(struct super_block *sb,// IN: f + { +VMBlockInodeInfo *iinfo; +struct inode *inode; +- struct nameidata actualNd; ++ struct path actualNd; + +ASSERT(sb); + +diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h +--- vmblock-only.orig/shared/compat_namei.h2014-11-20 19:29:15.0 -0500 vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.0 -0500 +@@ -26,21 +26,21 @@ + * struct. They were both replaced with a struct path. + */ + #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 25) +-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry ++#define compat_vmw_nd_to_dentry(nd) (nd).dentry + #else + #define compat_vmw_nd_to_dentry(nd) (nd).dentry + #endif + + /* In 2.6.25-rc2, path_release(nd) was replaced with path_put(nd.path). */ + #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 25) +-#define compat_path_release(nd) path_put((nd)-path) ++#define compat_path_release(nd) path_put(nd) + #else + #define compat_path_release(nd) path_release(nd) + #endif + + /* path_lookup was removed in 2.6.39 merge window VFS merge */ + #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 38) +-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, ((nd)-path)) ++#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd) + #else + #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd) + #endif diff --git a/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch new file mode 100644 index 000..a8ec2b1 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch @@ -0,0 +1,29 @@ +diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c +--- vmci-only/linux/vmciKernelIf.c 2015-05-05 11:22:55.276071501 -0400 vmci-only.new/linux/vmciKernelIf.c 2015-05-05 11:23:58.912074950 -0400 +@@ -40,6 +40,7 @@ + #include linux/socket.h /* For memcpy_
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: a5c729fbf9a617c83527554d7a13da097d49c1f8 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Oct 14 01:58:18 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Oct 14 01:58:18 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a5c729fb added comments explaining reason/origin of patches for 271 patches Package-Manager: portage-2.2.8-r2 --- app-emulation/vmware-modules/files/271-3.10-00-userns.patch | 4 .../vmware-modules/files/271-3.10-01-create_proc_entry.patch | 4 app-emulation/vmware-modules/files/271-3.10-02-getname.patch | 5 + app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch | 4 app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch | 3 +++ app-emulation/vmware-modules/files/271-3.10-05-dentry.patch | 4 app-emulation/vmware-modules/files/271-3.10-06-inode.patch | 4 app-emulation/vmware-modules/files/271-3.10-07-hub.patch | 5 + app-emulation/vmware-modules/files/271-3.11-00-readdir.patch | 3 +++ app-emulation/vmware-modules/files/271-3.11-01-filldir.patch | 3 +++ app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch | 3 +++ app-emulation/vmware-modules/files/271-3.15-00-readlink.patch| 2 ++ app-emulation/vmware-modules/files/271-3.15-01-vsock.patch | 3 +++ app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 4 14 files changed, 51 insertions(+) diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch index c960b78..b1b78b7 100644 --- a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch +++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch @@ -1,3 +1,7 @@ +correctly initializes UID/GID values +gets UID correctly in light of user namespace API +origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888 + --- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.0 +0100 +++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.0 +0100 @@ -135,7 +135,8 @@ diff --git a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch index 85c3def..889ae71 100644 --- a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch +++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch @@ -1,3 +1,7 @@ +uses the new proc_create function to create /proc entries +instead of create_proc_entry which was deprecated: +https://lkml.org/lkml/2013/4/11/215 + --- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200 +++ b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200 @@ -208,9 +208,10 @@ diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch index 7bcf536..05ed8db 100644 --- a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch +++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch @@ -1,3 +1,8 @@ +uses __getname/__putname instead of getname. getname was deprecated +the new code calls __getname (which really is a specific type of +memory allocator, then copies the string safely from user space +into the allocated buffer + --- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100 +++ vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100 @@ -279,11 +279,17 @@ diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch index 3a9f785..981aabd 100644 --- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch +++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch @@ -1,3 +1,7 @@ +undefines DEPRECATED which is unfortunately also defined (as a string) +in linux/printk.h. Realistically, this macro isn't even used, so this +doesn't matter much. But it hushes some very loud warnings. + diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h --- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400 +++ vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 -0400 diff --git a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch index d030110..d5129ec 100644 --- a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch +++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch @@ -1,3 +1,6 @@ +hushes warnings about unused typedefs which are part of the static assert +technique that the code uses. We simply add an __attribute__((unused)) to each of them + --- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: 2513650a3e9235695b3e37dc924fd26c1d65442f Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Oct 14 02:03:46 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Oct 14 02:03:46 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=2513650a added comments for 279 and fixed up some comments for 271 patches Package-Manager: portage-2.2.8-r2 --- app-emulation/vmware-modules/files/271-3.10-06-inode.patch | 3 ++- app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch | 2 +- app-emulation/vmware-modules/files/271-3.15-00-readlink.patch | 1 + app-emulation/vmware-modules/files/279-3.10-00-userns.patch | 4 app-emulation/vmware-modules/files/279-3.10-01-getname.patch| 5 + app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch | 4 app-emulation/vmware-modules/files/279-3.10-04-dentry.patch | 4 app-emulation/vmware-modules/files/279-3.10-05-inode.patch | 5 + app-emulation/vmware-modules/files/279-3.15-00-readlink.patch | 3 +++ app-emulation/vmware-modules/files/279-3.15-01-vsock.patch | 3 +++ app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 4 11 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch index 4f6246d..01c8893 100644 --- a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch +++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch @@ -1,6 +1,7 @@ starting with kernel 3.6, d_revalidate takes an unsigned int flags as the second argument, not a nameidata pointer! see fs/namei.c -for implementation +for implementation. Also changing vfs_follow_link to nd_set_link. +See: https://lkml.org/lkml/2013/9/9/236 diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c --- vmblock-only/linux/inode.c 2013-11-05 23:33:26.0 -0500 diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch index f65284f..1bf2207 100644 --- a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch +++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch @@ -1,4 +1,4 @@ -The new API to get the hooknum +the new API to get the hooknum origionally from http://forums.gentoo.org/viewtopic-t-979802-start-25.html --- work/vmnet-only/filter.c 2013-08-27 20:29:04.0 +0100 diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch index b1c7f24..b8ee078 100644 --- a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch +++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch @@ -1,4 +1,5 @@ replacing usage of vfs_readlink with new readlink_copy API +see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090 diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c --- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400 diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch index c960b78..b1b78b7 100644 --- a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch +++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch @@ -1,3 +1,7 @@ +correctly initializes UID/GID values +gets UID correctly in light of user namespace API +origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888 + --- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.0 +0100 +++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.0 +0100 @@ -135,7 +135,8 @@ diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch index 7bcf536..05ed8db 100644 --- a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch +++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch @@ -1,3 +1,8 @@ +uses __getname/__putname instead of getname. getname was deprecated +the new code calls __getname (which really is a specific type of +memory allocator, then copies the string safely from user space +into the allocated buffer + --- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100 +++ vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100 @@ -279,11 +279,17 @@ diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch index 0cd1a16..98b28aa 100644 --- a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch +++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch @@ -1,3 +1,7 @@ +undefines DEPRECATED which is unfortunately also defined (as a string) +in linux/printk.h. Realistically, this macro isn't even used, so this +doesn't matter much. But it hushes some
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: a4ebbb5986cd81342824655c853c6330425269d2 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Tue Oct 14 02:26:54 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Tue Oct 14 02:26:54 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a4ebbb59 seems that NET_NAME_USER is more appropriate than NET_NAME_UNKNOWN adjusting patches Package-Manager: portage-2.2.8-r2 --- app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 2 +- app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch index 7c52455..e3ee3aa 100644 --- a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch +++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch @@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c NULL_TERMINATE_STRING(deviceName); - dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup); -+ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup); ++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup); if (!dev) { retval = -ENOMEM; goto out; diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch index 7c52455..e3ee3aa 100644 --- a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch +++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch @@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c NULL_TERMINATE_STRING(deviceName); - dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup); -+ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup); ++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup); if (!dev) { retval = -ENOMEM; goto out;
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 8435434eab0fc7c5d08581822ebda283458578c1 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:40:41 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:40:41 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=8435434e adding vmware-modules-279.2-r1, (workstation 10) which compiles cleanrly on 3.10.0, 3.11.0 and 3.12.0 --- .../vmware-modules/files/279-3.10-00-userns.patch | 37 +++ .../vmware-modules/files/279-3.10-01-getname.patch | 19 .../files/279-3.10-02-unused-typedef.patch | 112 .../vmware-modules/files/279-3.10-03-dentry.patch | 30 ++ .../vmware-modules/files/279-3.10-04-inode.patch | 31 ++ .../vmware-modules/files/279-3.10-05-hub.patch | 21 app-emulation/vmware-modules/files/279-apic.patch | 12 +++ .../vmware-modules/files/279-filldir.patch | 91 + .../vmware-modules/files/279-hardened.patch| 113 + .../files/279-makefile-include.patch | 65 .../files/279-makefile-kernel-dir.patch| 85 .../vmware-modules/files/279-netdevice.patch | 24 + .../vmware-modules/files/279-putname.patch | 13 +++ .../vmware-modules/files/279-vmblock.patch | 23 + .../vmware-modules/vmware-modules-279.2-r1.ebuild | 109 15 files changed, 785 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch new file mode 100644 index 000..c960b78 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch @@ -0,0 +1,37 @@ +--- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.0 +0100 b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.0 +0100 +@@ -135,7 +135,8 @@ +inode-i_size = INODE_TO_IINFO(inode)-nameLen; +inode-i_version = 1; +inode-i_atime = inode-i_mtime = inode-i_ctime = CURRENT_TIME; +- inode-i_uid = inode-i_gid = 0; ++ inode-i_uid = GLOBAL_ROOT_UID; ++ inode-i_gid = GLOBAL_ROOT_GID; +inode-i_op = LinkInodeOps; + +d_add(dentry, inode); + +--- a/vmci-only/linux/driver.c2013-03-20 17:57:35.0 +0100 b/vmci-only/linux/driver.c2013-03-20 17:57:43.0 +0100 +@@ -740,7 +740,7 @@ + goto init_release; + } + +- user = current_uid(); ++ user = from_kuid(current_user_ns(), current_uid()); + retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, +0 /* Unused */, vmciLinux-userVersion, +user, vmciLinux-context); + +--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.0 +0100 b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.0 +0100 +@@ -2866,7 +2866,7 @@ + vsk-connectTimeout = psk-connectTimeout; +} else { + vsk-trusted = capable(CAP_NET_ADMIN); +- vsk-owner = current_uid(); ++ vsk-owner = from_kuid(current_user_ns(), current_uid()); + vsk-queuePairSize = VSOCK_DEFAULT_QP_SIZE; + vsk-queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; + vsk-queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; + diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch new file mode 100644 index 000..7bcf536 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch @@ -0,0 +1,19 @@ +--- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100 vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100 +@@ -279,11 +279,17 @@ +int i; +int retval; + +- name = getname(buf); ++ name = __getname(); +if (IS_ERR(name)) { + return PTR_ERR(name); +} + ++ i = strncpy_from_user(name, buf, PATH_MAX); ++ if (i 0 || i == PATH_MAX) { ++ __putname(name); ++ return -EINVAL; ++ } ++ +for (i = strlen(name) - 1; i = 0 name[i] == '/'; i--) { diff --git a/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch new file mode 100644 index 000..d030110 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch @@ -0,0 +1,112 @@ +--- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400 vmblock-only/shared/vm_assert.h2014-10-07 22:48:01.346409957 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vmci-only/shared/vm_assert.h 2014-10-07 22
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 87ec4f2abfca54db62bfa89450aa1c55a2e5d9b5 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:47:01 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:47:01 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=87ec4f2a build on 3.14.0 --- .../files/279-3.10-03-deprecated.patch | 85 ++ ...10-03-dentry.patch = 279-3.10-04-dentry.patch} | 0 ...3.10-04-inode.patch = 279-3.10-05-inode.patch} | 0 .../vmware-modules/vmware-modules-279.2-r1.ebuild | 5 +- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch new file mode 100644 index 000..3a9f785 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch @@ -0,0 +1,85 @@ +diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h +--- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400 vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou + #define LOG_ONCE(_s) DO_ONCE(Log _s) + + #ifdef VMX86_DEVEL ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ +Warning(%s:%d: %s is DEPRECATED; %s\n, \ + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) + #endif + +diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h +--- vmci-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmci-only.new/shared/vm_assert.h 2014-10-09 21:52:52.348165492 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou + #define LOG_ONCE(_s) DO_ONCE(Log _s) + + #ifdef VMX86_DEVEL ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ +Warning(%s:%d: %s is DEPRECATED; %s\n, \ + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) + #endif + +diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h +--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou + #define LOG_ONCE(_s) DO_ONCE(Log _s) + + #ifdef VMX86_DEVEL ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ +Warning(%s:%d: %s is DEPRECATED; %s\n, \ + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) + #endif + +diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h +--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmnet-only.new/vm_assert.h 2014-10-09 21:52:57.736165784 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou + #define LOG_ONCE(_s) DO_ONCE(Log _s) + + #ifdef VMX86_DEVEL ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ +Warning(%s:%d: %s is DEPRECATED; %s\n, \ + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) + #endif + +diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h +--- vsock-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vsock-only.new/shared/vm_assert.h 2014-10-09 21:52:45.352165112 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou + #define LOG_ONCE(_s) DO_ONCE(Log _s) + + #ifdef VMX86_DEVEL ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ +Warning(%s:%d: %s is DEPRECATED; %s\n, \ + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) + #endif + diff --git a/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch similarity index 100% rename from app-emulation/vmware-modules/files/279-3.10-03-dentry.patch rename to app-emulation/vmware-modules/files/279-3.10-04
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 1a5f058793742777d3e60ca3b930fc54bb42a344 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:43:43 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:43:43 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=1a5f0587 now supports 3.13.0 --- .../vmware-modules/files/279-3.13-00-vmnet.patch | 36 ++ .../vmware-modules/vmware-modules-279.2-r1.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch new file mode 100644 index 000..4e9d7e9 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch @@ -0,0 +1,36 @@ +--- work/vmnet-only/filter.c 2013-08-27 20:29:04.0 +0100 patched/vmnet-only/filter.c 2014-01-26 01:09:05.184893854 + +@@ -27,6 +27,7 @@ + #include compat_module.h + #include linux/mutex.h + #include linux/netdevice.h ++#include linux/version.h + #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0) + # include linux/module.h + #else +@@ -203,7 +204,11 @@ + #endif + + static unsigned int ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 13, 0) + VNetFilterHookFn(unsigned int hooknum, // IN: ++#else ++VNetFilterHookFn(const struct nf_hook_ops *ops,// IN: ++#endif + #ifdef VMW_NFHOOK_USES_SKB + struct sk_buff *skb, // IN: + #else +@@ -252,7 +257,12 @@ + +/* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */ +/* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */ +- transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ ++ #if LINUX_VERSION_CODE KERNEL_VERSION(3, 13, 0) ++ transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ #else ++ transmit = (ops-hooknum == VMW_NF_INET_POST_ROUTING); ++ #endif + +packetHeader = compat_skb_network_header(skb); +ip = (struct iphdr*)packetHeader; diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild index 1212ca8..cd4419a 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild @@ -90,6 +90,7 @@ src_prepare() { kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch + kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch # Allow user patches so they can support RC kernels and whatever else
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 195bd13fb5abc21ec6c31396b0a7018df192796d Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:51:14 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:51:14 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=195bd13f now compiles on 3.17.0 :-) --- app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 12 app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch new file mode 100644 index 000..fbe1741 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch @@ -0,0 +1,12 @@ +diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c +--- vmnet-only/netif.c 2013-11-06 00:40:52.0 -0500 vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400 +@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName, // IN: +memcpy(deviceName, devName, sizeof deviceName); +NULL_TERMINATE_STRING(deviceName); + +- dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup); ++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup); +if (!dev) { + retval = -ENOMEM; + goto out; diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild index e5875a7..d6cc8ea 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild @@ -94,6 +94,7 @@ src_prepare() { kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch + kernel_is ge 3 17 0 epatch ${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: 86a9b9c8758c45e519653a5652a7869cd990ffc8 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:48:56 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:48:56 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=86a9b9c8 compiles on 3.16.0 --- .../files/279-3.15-00-readlink.patch | 12 ++ .../vmware-modules/files/279-3.15-01-vsock.patch | 43 ++ .../vmware-modules/vmware-modules-279.2-r1.ebuild | 3 +- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch new file mode 100644 index 000..36be37f --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch @@ -0,0 +1,12 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c +--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400 vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400 +@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry, + return -EINVAL; +} + +- return vfs_readlink(dentry, buffer, buflen, iinfo-name); ++ return readlink_copy(buffer, buflen, iinfo-name); + } + + diff --git a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch new file mode 100644 index 000..a880a75 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch @@ -0,0 +1,43 @@ +diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c +--- vsock-only/linux/notify.c 2013-11-05 23:33:27.0 -0500 vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400 +@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk, +vsk = vsock_sk(sk); +PKT_FIELD(vsk, sentWaitingRead) = FALSE; + #endif +- ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else +sk-sk_data_ready(sk, 0); ++#endif + } + + +diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c +--- vsock-only/linux/notifyQState.c2013-11-05 23:33:27.0 -0500 vsock-only.new/linux/notifyQState.c2014-10-05 23:46:33.231303931 -0400 +@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk, + struct sockaddr_vm *dst,// IN: unused + struct sockaddr_vm *src)// IN: unused + { ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else +sk-sk_data_ready(sk, 0); ++#endif + } + + +@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct + } + + /* See the comment in VSockVmciNotifyPktSendPostEnqueue */ ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else + sk-sk_data_ready(sk, 0); ++#endif +} + +return err; diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild index 131d93a..e5875a7 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild @@ -92,7 +92,8 @@ src_prepare() { kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch - + kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch + kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/open-vm-tools-kmod/, app-emulation/vmware-workstation/files/, ...
commit: ca8c57bf573ea8326c4fb6528fabf190a5cc5ee9 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 16:14:05 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 16:14:05 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=ca8c57bf more synching with mainline --- app-emulation/open-vm-tools-kmod/Manifest | 1 + app-emulation/vmware-workstation/Manifest | 11 ++--- .../vmware-workstation/files/configure-hostd.sh| 20 .../files/list-bundle-components.xsl | 17 --- .../files/list-component-files.xsl | 19 .../vmware-workstation/files/vmware-9.0.rc | 33 - .../vmware-workstation/files/vmware-server-8.0.rc | 55 -- .../vmware-workstation/files/vmware-server-9.0.rc | 55 -- ...ld = vmware-workstation-10.0.2.1744117.ebuild} | 26 ++ 9 files changed, 22 insertions(+), 215 deletions(-) diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest new file mode 100644 index 000..b35af64 --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/Manifest @@ -0,0 +1 @@ +DIST open-vm-tools-2013.09.16-1328054.tar.gz 3793719 SHA256 470a6ea3ce14c2c5ea6b7bc59745eccbacc8d88a3f343e712312786435975d13 SHA512 7ae62d5411b4bdefd0e8db5f0a81bb357bfd4a624af06bf9a5a74f49ede0b7051b41dfe548c758fd7e73cded34af983c8aa0c412e65343092e05ae9b997895cb WHIRLPOOL 688fb4e494fb7aab7d0eb09189afff95ec8727bcc1893a4ec632bb8198661a1a55d58a813d2d56a3ac330fd7a55afc1fa7dc11f1d60c06c91ecf6a0bf866b249 diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 6d9b424..0c6a39b 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -1,8 +1,3 @@ -DIST VMware-Workstation-7.1.6-744570.i386.bundle 130391795 SHA256 fbeadabe7c0929a10f144dc82e37afc73bbd60bedf299bb2c6142dda379ad5b4 SHA512 c57148f0ef7041bdadf46668aaddd0315134185103706dc23815bf3ebe4f2389a9387c63d0caf3fb0e1baf236320c633264e473439b2e00eb26c11d489e6af0a WHIRLPOOL e631ccb14424d5165fc2f9bbe7d910e60c06ed3f4c5fbddbbf5b4bc66153a84927a3779359f3d07b258a59766ff9d063585e1ecc70dc4d107c073bf529541dbf -DIST VMware-Workstation-7.1.6-744570.x86_64.bundle 137422513 SHA256 1a0694349393ce326f62c291d76c1c5e8d5473b49bf986476e1485df422a2f8f SHA512 df72b0c770f9e356efd1bbffe2c596909f193bc2100a015cfbab819fea017ee735fcc932180c0cc5ffbe8223fa66a06dcd35e34d183b06f71c7ba937c440e2fd WHIRLPOOL e7b50e706b88e30801ccaeaedf59f5fbdf06342d8566a65b3cb19ec2c433da52768b55f9e5e58e274071c284d38280e0635f8a9c3fd2d01f53037c1082d15af3 -DIST VMware-Workstation-8.0.4-744019.i386.bundle.tar 189839360 SHA256 5b469de4f583fc0d33750253244c23e0f6a9d5b713e8d46ea3dd07f01af2b5ed SHA512 f0b17262594bf613a971c49843eec8fd1182a031c0cdca91824a1c6a0315e87183c0d99f6e37e2aa3a9a9a00f57efbbc6ff155094aa6cc776901177697aa8e49 WHIRLPOOL bf5a7a2f8c7cfc53fe2d0dfbe1b8b1fa9452a3eb0a1b5a70363dab4bd23c86a628a3938b5c5c30301639ea748347230fc3ad0b8977dabc1c2b828f6dde81b1f1 -DIST VMware-Workstation-8.0.4-744019.x86_64.bundle.tar 189552640 SHA256 83cdf3f4cf99afdd3e9685b5cc50f613094cc24e7502a2dc577f05640382a6c5 SHA512 87258301b157f9bade30094a02a5f3749342b00ccb5b1359d10152331d3d257bb1afe23fa7b68c973e2f4e2b9e9afc7ca52e99118041e1d45be3099f8d10d51c WHIRLPOOL 1bf6ce95e63042bb47971c36f55f943ef8ce736c5f9355fe7afbc114a09f716277199a847af041bd467cdb02170414bd660bafa54cce59029347e27ffda6eb73 -DIST VMware-Workstation-8.0.5-893925.i386.bundle.tar 188180480 SHA256 79033aa837a1b2fcf1229c407b159586152d41f3c624ae1745264443bad06a90 SHA512 2ea55d6ba1b64ee33ca73af46ce4ba58be441ecb973e4f9e3711b7d516b1d6233ee8e125c0d90226169258a5bbccf73f67ea593a1eaa48e7368275f545db3306 WHIRLPOOL 270b37814ee4c19bbe3e1d573016cf1899a90dc1c3500181eeb336220eebde276fb11bb4e46d3121a8e1517f749fe9a127eb76f642938d7b8e8f22ae3fbed556 -DIST VMware-Workstation-8.0.5-893925.x86_64.bundle.tar 187729920 SHA256 39010a8b712c9e9ea86f0bf32b1ad86a7788748f00292f344b1bdea899a6ac0d SHA512 010cbe7a6ffa6cd07b6daab8534c4da260aae17a6c7988e74792aa450f266bea306cca49820a65dfb3e0b76e912a5430fe98f4f0446f750fe26b867cfe2ed48d WHIRLPOOL dbf6994fbf87b3eca0fe882075dbdd68de599c7b699e609a43d3bade5e23704158ef11a13dea12b41c2c3c7d57ba493e324b4ebf2b138c9cf5835699ba76ae55 -DIST VMware-Workstation-9.0.2-1031769.i386.bundle.tar 264898560 SHA256 f23efa3db418790cffa38a90639edd0f5e0834fa98c69a3146489cc3774a71c7 SHA512 ea38c747e236e3a5ae3da809f22a997044c3306239afbc2cc28dfd04f3589dc23e35295bcb5dfb7f5ea687a908b790fb56afa062b7a5cea523c8645d94d652b0 WHIRLPOOL 18aaed121c973911d00a89790b98c8b22b942d29a3580181e7937fe27882d4cd30b2e0a7c13d22129c2e72c7cbce87cff0c80f32e6726d25cf67ec159506db46 -DIST VMware-Workstation-9.0.2-1031769.x86_64.bundle.tar 232693760 SHA256 53e175340086f8be2a9cf6c272fe1f8721aa06ed227a2c880a23323c4c491ee3 SHA512
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-tools/
commit: fd40acca7d289df68b3fc616b0e3b184dc05f8d4 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 16:09:24 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 16:09:24 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=fd40acca more synching with mainline --- app-emulation/vmware-modules/Manifest | 44 + app-emulation/vmware-tools/Manifest| 48 +-- .../vmware-tools/vmware-tools-8.4.9.744570.ebuild | 55 - .../vmware-tools/vmware-tools-9.2.3.1031769.ebuild | 56 -- ...25.ebuild = vmware-tools-9.6.2.1744117.ebuild} | 6 +-- 5 files changed, 59 insertions(+), 150 deletions(-) diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index e69de29..30288f3 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -0,0 +1,44 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA256 + +AUX 271-3.10.0.patch 23418 SHA256 346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410 WHIRLPOOL 196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e +AUX 271-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0 +AUX 271-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb +AUX 271-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338 +AUX 271-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6 +AUX 271-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a +AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45 +AUX 271-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3954bf6a82960e78ebd120c1eb2aac68e8 +AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba +AUX 279-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0 +AUX 279-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-player/
commit: b23ef6aca3d68aa9a6ad81d1351372306db6e42c Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 16:04:35 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 16:04:35 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b23ef6ac trying to generate some manifests --- app-emulation/vmware-modules/Manifest | 0 app-emulation/vmware-player/Manifest | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest new file mode 100644 index 000..e69de29 diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index ea1f747..65d7b3e 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,2 +1,2 @@ -DIST VMware-Player-5.0.2-1031769.i386.bundle.tar 220037120 SHA256 9ed94f5137f96d5ab1b4898abb7bdc1ab84edf7eb8b6477ca3f33a9b18e4d0be SHA512 5fac9dc97ff36631c40765fe4e63c734176891441f3dfbeb417d1dae7db02db7b65c799ae706cbbb8edd91c8aed3fe6d11ebbae8c69a82d37b3ddc48261bff5c WHIRLPOOL c7e634f59c6852e58f7665de7db9c4295451592ba61de738e4cac927907b9d662a9b944579aca1474b5bf5c241d1a5bbcc1ed8c07aff1c31d1d39d4a66309fe4 -DIST VMware-Player-5.0.2-1031769.x86_64.bundle.tar 185395200 SHA256 5ba11b8d4ece91c9dc1f9ed096e7c2d420370d8809b4d009a355fca390698482 SHA512 58695587244c142953a55b9f8c4400e54f0951297aab594544d569d15ec3e25c71f4885eb59bfa453cfb6a8c33bfcaff77412dc4a79349c22285b72ec700f635 WHIRLPOOL 554986c680cd4caa760cdc9c9ddf75769be9a92a45ebefa7daabc6697801fa170e6f738ce513d819d4d3f22e3a33424fc559408187a6ee48b969c109bd86ee52 +DIST VMware-Player-6.0.2-1744117.i386.bundle.tar 233226240 SHA256 b3314b1b4658fff3a3bd821381e141b4039bc6925088d509f073dfdc19f78937 SHA512 da912c898306a50392cdf814f523321962e70d6d2afabe2cbcec35e581c60d1ba3e28fdf11f4e83306c9057038a7ab8d1d1e2e4281068fdb9997f6d1aaf34e74 WHIRLPOOL bdd81a3620a56a689f48443d8cb0fc5dbde8ec5d996fcff5e38a983eb4fa5d6bfb73658f1b15837f6c4272578b4f90875f9393db3318ee9ad84cf1266fbcbed5 +DIST VMware-Player-6.0.2-1744117.x86_64.bundle.tar 200560640 SHA256 6e8ef0982303128fe2d41f59cc6d4031edcc85f4dcc8ba20e17df9837a4c972f SHA512 8e71b59e5152ec6a21e2bc87e11462fbc9f25a27ea48e73ace6daa198bc75fb0cf49d895755abe10b3fb52df0ec0586fd00e8bd51c461b7a638e745c6bbd996e WHIRLPOOL a9af879ce290a9f0ac2fb5f6af425e509455d6fb553156250013a941e782c416435be7326498ed544ee81623fbac4a5924940cc05dd56325c0d8e4c71c44b0b8
[gentoo-commits] proj/vmware:master commit in: app-emulation/open-vm-tools-kmod/files/, app-emulation/open-vm-tools-kmod/
commit: b55dad0ffdcb610e070ebf66cc1f7bd5be37ea4a Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 15:58:05 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 15:58:05 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b55dad0f synching open-vm-tools-kmod with latest in mainline --- app-emulation/open-vm-tools-kmod/Manifest | 5 - .../open-vm-tools-kmod/files/fragsize.patch| 104 - .../open-vm-tools-kmod/files/frozen.patch | 28 -- .../open-vm-tools-kmod/files/putname.patch | 13 --- .../files/vmhgfs-linux-3.11.patch | 42 + .../open-vm-tools-kmod-2012.10.14.874563.ebuild| 77 --- .../open-vm-tools-kmod-2012.12.26.958366.ebuild| 77 --- .../open-vm-tools-kmod-2013.04.16.1098359.ebuild | 79 .../open-vm-tools-kmod-2013.09.16.1328054.ebuild | 67 + .../open-vm-tools-kmod-8.8.2.590212-r1.ebuild | 76 --- .../open-vm-tools-kmod-9.2.2.893683.ebuild | 77 --- 11 files changed, 109 insertions(+), 536 deletions(-) diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest deleted file mode 100644 index 50c1c4c..000 --- a/app-emulation/open-vm-tools-kmod/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb -DIST open-vm-tools-2012.12.26-958366.tar.gz 3622541 SHA256 8d63a9c1e36ef968b87125b3c55c8ed5f75ecc9eafe84716eddee687b5b81606 SHA512 748d44951dcdff570faab071a5681ce68f8647df002de3a79853fbf1571835499f2dabc863cc7782b23fd55ad568d479ab10db9ff0bfc7c27cab4999b61f2a89 WHIRLPOOL ce4a51e9a40afea2a2f410e05ff9ca3535611a53d99c05e4d079f9b6df2cef1373113e3ec82bec378441f5f6689f6211c570c0ed4cfffe84534943d875f1bacb -DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f -DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56 -DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872 diff --git a/app-emulation/open-vm-tools-kmod/files/fragsize.patch b/app-emulation/open-vm-tools-kmod/files/fragsize.patch deleted file mode 100644 index 1f85df5..000 --- a/app-emulation/open-vm-tools-kmod/files/fragsize.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/modules/linux/vmxnet/vmxnet.c b/modules/linux/vmxnet/vmxnet.c -index a6f5740..3c75bb2 100644 a/modules/linux/vmxnet/vmxnet.c -+++ b/modules/linux/vmxnet/vmxnet.c -@@ -989,7 +989,7 @@ vmxnet_probe_device(struct pci_dev *pdev, // IN: vmxnet PCI device - .ndo_start_xmit = vmxnet_start_tx, - .ndo_stop = vmxnet_close, - .ndo_get_stats = vmxnet_get_stats, -- .ndo_set_multicast_list = vmxnet_set_multicast_list, -+ .ndo_set_rx_mode = vmxnet_set_multicast_list, - .ndo_change_mtu = vmxnet_change_mtu, - # ifdef VMW_HAVE_POLL_CONTROLLER - .ndo_poll_controller = vmxnet_netpoll, -@@ -2033,21 +2033,23 @@ vmxnet_map_pkt(struct sk_buff *skb, - offset -= skb_headlen(skb); - - for ( ; nextFrag skb_shinfo(skb)-nr_frags; nextFrag++){ -+ int fragSize; - frag = skb_shinfo(skb)-frags[nextFrag]; -+ fragSize = skb_frag_size(frag); - - // skip those frags that are completely copied -- if (offset = frag-size){ --offset -= frag-size; -+ if (offset = fragSize){ -+offset -= fragSize; - } else { - // map the part of the frag that is not copied - dma = pci_map_page(lp-pdev
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/
commit: 8143bff01172d2dcadd8ac2a8fab8fce0df467f2 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 21:50:49 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 21:50:49 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=8143bff0 cleaning up whitespace of the ebuilds Package-Manager: portage-2.2.8-r2 --- app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 10 +- app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 181d792..96c6ccf 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -65,21 +65,21 @@ src_prepare() { use pax_kernel epatch ${FILESDIR}/${PV_MAJOR}-hardened.patch epatch ${FILESDIR}/${PV_MAJOR}-apic.patch kernel_is ge 3 7 0 epatch ${FILESDIR}/${PV_MAJOR}-putname.patch - + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-05-dentry.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-06-inode.patch - + # fixes a memcpy/memcmp bug in the hub code kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-07-hub.patch - + kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch - kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch + kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch kernel_is ge 3 17 0 epatch ${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild index 96b318b..bf8e379 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild @@ -85,8 +85,6 @@ src_prepare() { kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch - - kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/
commit: c913e12bbfc10de4c840bdf3ae2792c4ccbf3032 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 21:52:35 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 21:52:35 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=c913e12b adding missing file --- .../vmware-workstation/files/vmware-10.0.rc| 37 ++ 1 file changed, 37 insertions(+) diff --git a/app-emulation/vmware-workstation/files/vmware-10.0.rc b/app-emulation/vmware-workstation/files/vmware-10.0.rc new file mode 100644 index 000..82e45f1 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-10.0.rc @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $ + +depend() { + need localmount + use net +} + +start() { + ebegin Starting VMware USB Arbitrator + #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator + @@BINDIR@@/vmware-usbarbitrator + eend $? + ebegin Starting VMware services + modprobe -v vmci || modprobe -v vmw_vmci + eend $? + modprobe -av vmmon vmci vsock vmblock vmnet + eend $? + @@BINDIR@@/vmware-networks --start + eend $? +} + +stop() { + ebegin Stopping VMware USB Arbitrator + #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator + killall --wait @@BINDIR@@/vmware-usbarbitrator + eend $? + @@BINDIR@@/vmware-networks --stop + eend $? + ebegin Stopping VMware services + modprobe -rv vsock vmmon vmblock vmnet + eend $? + modprobe -rv vmci || modprobe -rv vmw_vmci + eend $? +}
[gentoo-commits] proj/vmware:master commit in: /
commit: f62a01d79a2143ae65c3669126970134259a0396 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 21:52:59 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 21:52:59 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=f62a01d7 Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/vmware .../vmware-vix/vmware-vix-1.11.4.744019.ebuild | 6 +++--- ...build = vmware-vsphere-cli-4.1.0.254719-r1.ebuild} | 18 +- 2 files changed, 12 insertions(+), 12 deletions(-)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 9855e554b7065d7a7233017037371f70b7abe796 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Sat Oct 11 21:49:37 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Sat Oct 11 21:49:37 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=9855e554 correcting the patches for VMware 10 Package-Manager: portage-2.2.8-r2 --- app-emulation/vmware-modules/Manifest | 44 .../files/279-3.10-02-unused-typedef.patch | 112 - .../files/279-3.10-03-deprecated.patch | 70 ++--- .../vmware-modules/files/279-3.10-05-hub.patch | 21 .../vmware-modules/files/279-3.13-00-vmnet.patch | 36 --- .../vmware-modules/vmware-modules-279.2-r1.ebuild | 4 - 6 files changed, 35 insertions(+), 252 deletions(-) diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest deleted file mode 100644 index 30288f3..000 --- a/app-emulation/vmware-modules/Manifest +++ /dev/null @@ -1,44 +0,0 @@ --BEGIN PGP SIGNED MESSAGE- -Hash: SHA256 - -AUX 271-3.10.0.patch 23418 SHA256 346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410 WHIRLPOOL 196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e -AUX 271-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0 -AUX 271-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb -AUX 271-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338 -AUX 271-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6 -AUX 271-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a -AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45 -AUX 271-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3954bf6a82960e78ebd120c1eb2aac68e8 -AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba -AUX 279-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0 -AUX 279-filldir.patch 2485 SHA256
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: 10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 21:09:30 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 21:09:30 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10ad4083 now properly compiles with minimal wanrings for 3.10, moving onto 3.11 testing :-) --- .../files/271-3.10-04-unused-typedef.patch | 112 + .../vmware-modules/files/271-3.10-05-dentry.patch | 30 ++ .../vmware-modules/files/271-3.10-06-inode.patch | 31 ++ .../vmware-modules/files/271-3.10-07-hub.patch | 21 4 files changed, 194 insertions(+) diff --git a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch new file mode 100644 index 000..d030110 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch @@ -0,0 +1,112 @@ +--- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400 vmblock-only/shared/vm_assert.h2014-10-07 22:48:01.346409957 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vmci-only/shared/vm_assert.h 2014-10-07 22:43:39.519402467 -0400 vmci-only/shared/vm_assert.h 2014-10-07 22:47:51.829409685 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vmmon-only/include/vm_assert.h 2014-10-07 22:43:39.520402467 -0400 vmmon-only/include/vm_assert.h 2014-10-07 22:47:39.246409325 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vmnet-only/vm_assert.h 2014-10-07 22:43:39.520402467 -0400 vmnet-only/vm_assert.h 2014-10-07 22:47:55.804409799 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vsock-only/shared/vm_assert.h 2014-10-07 22:47:11.595408534 -0400 vsock-only/shared/vm_assert.h 2014-10-07 22:45:55.715406363 -0400 +@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou + #define ASSERT_ON_COMPILE(e) \ +do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} while (0) + + +--- vsock-only/shared/vm_atomic.h 2013-11-05 23:33:27.0 -0500 vsock-only/shared/vm_atomic.h 2014-10-07 22:53:06.024418673 -0400 +@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, // +8 * sizeof (out) == size \ +8 * sizeof (cast) == size \ + ? 1 : -1 }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ +} \ + \ + \ +--- vmci-only/shared/vm_atomic.h 2013-11-05 23:33:27.0 -0500 vmci-only/shared/vm_atomic.h 2014-10-07 22:53:24.873419213 -0400 +@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, // +8 * sizeof (out) == size \ +8 * sizeof (cast) == size \ + ? 1 : -1 }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 5bf8b1f68790299292623fa59ecce2415a230ade Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 21:24:40 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 21:24:40 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=5bf8b1f6 compiles with 3.14/3.15 moving onto 3.16... --- .../files/271-3.15-00-readlink.patch | 12 ++ .../vmware-modules/files/271-3.15-01-vsock.patch | 43 ++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 7 ++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch new file mode 100644 index 000..36be37f --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch @@ -0,0 +1,12 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c +--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400 vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400 +@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry, + return -EINVAL; +} + +- return vfs_readlink(dentry, buffer, buflen, iinfo-name); ++ return readlink_copy(buffer, buflen, iinfo-name); + } + + diff --git a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch new file mode 100644 index 000..a880a75 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch @@ -0,0 +1,43 @@ +diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c +--- vsock-only/linux/notify.c 2013-11-05 23:33:27.0 -0500 vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400 +@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk, +vsk = vsock_sk(sk); +PKT_FIELD(vsk, sentWaitingRead) = FALSE; + #endif +- ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else +sk-sk_data_ready(sk, 0); ++#endif + } + + +diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c +--- vsock-only/linux/notifyQState.c2013-11-05 23:33:27.0 -0500 vsock-only.new/linux/notifyQState.c2014-10-05 23:46:33.231303931 -0400 +@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk, + struct sockaddr_vm *dst,// IN: unused + struct sockaddr_vm *src)// IN: unused + { ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else +sk-sk_data_ready(sk, 0); ++#endif + } + + +@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct + } + + /* See the comment in VSockVmciNotifyPktSendPostEnqueue */ ++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0) ++ sk-sk_data_ready(sk); ++#else + sk-sk_data_ready(sk, 0); ++#endif +} + +return err; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index e922472..f1b1f2b 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -79,10 +79,9 @@ src_prepare() { kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch - - kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch - - + kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch + kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch + kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: afba145791293bf201c88e3e4c4b0dad9ec3ac54 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 21:16:53 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 21:16:53 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=afba1457 compiles cleanly with 3.11, moving onto 3.12 --- .../vmware-modules/files/271-3.11-00-readdir.patch | 38 .../vmware-modules/files/271-3.11-01-filldir.patch | 50 ++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 21 +++-- 3 files changed, 105 insertions(+), 4 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch new file mode 100644 index 000..15a9a8f --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch @@ -0,0 +1,38 @@ +diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c +--- vmblock-only/linux/file.c 2013-11-05 23:33:26.0 -0500 vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400 +@@ -166,11 +166,9 @@ + + static int + FileOpReaddir(struct file *file, // IN +- void *dirent, // IN +- filldir_t filldir) // IN ++ struct dir_context *ctx) + { +int ret; +- FilldirInfo info; +struct file *actualFile; + +if (!file) { +@@ -184,11 +182,8 @@ + return -EINVAL; +} + +- info.filldir = filldir; +- info.dirent = dirent; +- +actualFile-f_pos = file-f_pos; +- ret = vfs_readdir(actualFile, Filldir, info); ++ ret = iterate_dir(actualFile, ctx); +file-f_pos = actualFile-f_pos; + +return ret; +@@ -237,7 +232,7 @@ + + + struct file_operations RootFileOps = { +- .readdir = FileOpReaddir, ++ .iterate = FileOpReaddir, +.open= FileOpOpen, +.release = FileOpRelease, + }; diff --git a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch new file mode 100644 index 000..d36c61a --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch @@ -0,0 +1,50 @@ +diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c +--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400 vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400 +@@ -38,46 +38,6 @@ typedef u64 inode_num_t; + typedef ino_t inode_num_t; + #endif + +-/* Specifically for our filldir_t callback */ +-typedef struct FilldirInfo { +- filldir_t filldir; +- void *dirent; +-} FilldirInfo; +- +- +-/* +- * +- * +- * Filldir -- +- * +- *Callback function for readdir that we use in place of the one provided. +- *This allows us to specify that each dentry is a symlink, but pass through +- *everything else to the original filldir function. +- * +- * Results: +- *Original filldir's return value. +- * +- * Side effects: +- *Directory information gets copied to user's buffer. +- * +- * +- */ +- +-static int +-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir +-const char *name, // IN: Dirent name +-int namelen,// IN: len of dirent's name +-loff_t offset, // IN: Offset +-inode_num_t ino,// IN: Inode number of dirent +-unsigned int d_type)// IN: Type of file +-{ +- FilldirInfo *info = buf; +- +- /* Specify DT_LNK regardless */ +- return info-filldir(info-dirent, name, namelen, offset, ino, DT_LNK); +-} +- +- + /* File operations */ + + /* diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 72b49b0..7b2771a 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -66,10 +66,23 @@ src_prepare() { epatch ${FILESDIR}/${PV_MAJOR}-apic.patch kernel_is ge 3 7 0 epatch ${FILESDIR}/${PV_MAJOR}-putname.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-271-3.10-00-userns.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-271-3.10-01-create_proc_entry.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-271-3.10-02-getname.patch - kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-271-3.10-03-deprecated.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch + kernel_is ge 3 10 0 epatch ${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch + kernel_is ge 3 10 0 epatch
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 641205e8d0e691be4155abc1c5dc2c4232898304 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 21:34:25 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 21:34:25 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=641205e8 now compiles with 3.16/3.17, i think that makes it up to date! --- app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 12 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch new file mode 100644 index 000..fbe1741 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch @@ -0,0 +1,12 @@ +diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c +--- vmnet-only/netif.c 2013-11-06 00:40:52.0 -0500 vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400 +@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName, // IN: +memcpy(deviceName, devName, sizeof deviceName); +NULL_TERMINATE_STRING(deviceName); + +- dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup); ++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup); +if (!dev) { + retval = -ENOMEM; + goto out; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index f1b1f2b..181d792 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -82,6 +82,7 @@ src_prepare() { kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch kernel_is ge 3 15 0 epatch ${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch + kernel_is ge 3 17 0 epatch ${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: 4d9b602206d7e267af066b17f437934479b36ac0 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 20:17:17 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 20:17:17 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=4d9b6022 doing an initial commit which should patch and compile correctly for 3.10 kernels as a test run --- .../vmware-modules/files/271-3.10-00-userns.patch | 37 + .../files/271-3.10-01-create_proc_entry.patch | 24 +++ .../vmware-modules/files/271-3.10-02-getname.patch | 19 +++ .../files/271-3.10-03-deprecated.patch | 90 +++ app-emulation/vmware-modules/files/271-apic.patch | 12 ++ .../vmware-modules/files/271-hardened.patch| 170 + .../files/271-makefile-include.patch | 65 .../files/271-makefile-kernel-dir.patch| 85 +++ .../vmware-modules/files/271-netdevice.patch | 24 +++ .../vmware-modules/files/271-putname.patch | 13 ++ app-emulation/vmware-modules/metadata.xml | 13 ++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 87 +++ 12 files changed, 639 insertions(+) diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch new file mode 100644 index 000..c960b78 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch @@ -0,0 +1,37 @@ +--- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.0 +0100 b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.0 +0100 +@@ -135,7 +135,8 @@ +inode-i_size = INODE_TO_IINFO(inode)-nameLen; +inode-i_version = 1; +inode-i_atime = inode-i_mtime = inode-i_ctime = CURRENT_TIME; +- inode-i_uid = inode-i_gid = 0; ++ inode-i_uid = GLOBAL_ROOT_UID; ++ inode-i_gid = GLOBAL_ROOT_GID; +inode-i_op = LinkInodeOps; + +d_add(dentry, inode); + +--- a/vmci-only/linux/driver.c2013-03-20 17:57:35.0 +0100 b/vmci-only/linux/driver.c2013-03-20 17:57:43.0 +0100 +@@ -740,7 +740,7 @@ + goto init_release; + } + +- user = current_uid(); ++ user = from_kuid(current_user_ns(), current_uid()); + retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, +0 /* Unused */, vmciLinux-userVersion, +user, vmciLinux-context); + +--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.0 +0100 b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.0 +0100 +@@ -2866,7 +2866,7 @@ + vsk-connectTimeout = psk-connectTimeout; +} else { + vsk-trusted = capable(CAP_NET_ADMIN); +- vsk-owner = current_uid(); ++ vsk-owner = from_kuid(current_user_ns(), current_uid()); + vsk-queuePairSize = VSOCK_DEFAULT_QP_SIZE; + vsk-queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; + vsk-queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; + diff --git a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch new file mode 100644 index 000..85c3def --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch @@ -0,0 +1,24 @@ +--- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200 b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200 +@@ -208,9 +208,10 @@ +VMBlockSetProcEntryOwner(controlProcMountpoint); + +/* Create /proc/fs/vmblock/dev */ +- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, +-VMBLOCK_CONTROL_MODE, +-controlProcDirEntry); ++ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, ++ VMBLOCK_CONTROL_MODE, ++ controlProcDirEntry, ++ ControlFileOps); +if (!controlProcEntry) { + Warning(SetupProcDevice: could not create VMBLOCK_DEVICE \n); + remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry); +@@ -218,7 +219,6 @@ + return -EINVAL; +} + +- controlProcEntry-proc_fops = ControlFileOps; +return 0; + } + diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch new file mode 100644 index 000..7bcf536 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch @@ -0,0 +1,19 @@ +--- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100 vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100 +@@ -279,11 +279,17 @@ +int i; +int retval; + +- name = getname(buf); ++ name = __getname(); +if (IS_ERR(name)) { + return PTR_ERR(name); +} + ++ i
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
commit: c03d98c3ed5ce0336044e36afcee4abf806d5fac Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Fri Oct 10 01:55:55 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Fri Oct 10 01:55:55 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=c03d98c3 a better approach to dealing with deprecated macro redefinition --- .../files/271-3.10-03-deprecated.patch | 75 ++ 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch index 862ef97..3a9f785 100644 --- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch +++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch @@ -1,90 +1,85 @@ diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h vmblock-only/shared/vm_assert.h2013-11-05 23:33:27.0 -0500 -+++ vmblock-only.new/shared/vm_assert.h2014-10-07 18:13:59.583815971 -0400 -@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou +--- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400 vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou #define LOG_ONCE(_s) DO_ONCE(Log _s) #ifdef VMX86_DEVEL -- #define DEPRECATED(_fix) DO_ONCE(\ -+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \ ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ Warning(%s:%d: %s is DEPRECATED; %s\n, \ __FILE__, __LINE__, __FUNCTION__, \ _fix)) #else -- #define DEPRECATED(_fix) do {} while (0) -+ #define VMWARE_DEPRECATED(_fix) do {} while (0) ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) #endif - diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h vmci-only/shared/vm_assert.h 2013-11-05 23:33:27.0 -0500 -+++ vmci-only.new/shared/vm_assert.h 2014-10-07 18:14:18.470816995 -0400 -@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou +--- vmci-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmci-only.new/shared/vm_assert.h 2014-10-09 21:52:52.348165492 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou #define LOG_ONCE(_s) DO_ONCE(Log _s) #ifdef VMX86_DEVEL -- #define DEPRECATED(_fix) DO_ONCE(\ -+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \ ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ Warning(%s:%d: %s is DEPRECATED; %s\n, \ __FILE__, __LINE__, __FUNCTION__, \ _fix)) #else -- #define DEPRECATED(_fix) do {} while (0) -+ #define VMWARE_DEPRECATED(_fix) do {} while (0) ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) #endif - diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h vmmon-only/include/vm_assert.h 2013-11-06 00:40:51.0 -0500 -+++ vmmon-only.new/include/vm_assert.h 2014-10-07 18:14:12.118816650 -0400 -@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou +--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400 +@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou #define LOG_ONCE(_s) DO_ONCE(Log _s) #ifdef VMX86_DEVEL -- #define DEPRECATED(_fix) DO_ONCE(\ -+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \ ++ #undef DEPRECATED +#define DEPRECATED(_fix) DO_ONCE(\ Warning(%s:%d: %s is DEPRECATED; %s\n, \ __FILE__, __LINE__, __FUNCTION__, \ _fix)) #else -- #define DEPRECATED(_fix) do {} while (0) -+ #define VMWARE_DEPRECATED(_fix) do {} while (0) ++ #undef DEPRECATED +#define DEPRECATED(_fix) do {} while (0) #endif - diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h vmnet-only/vm_assert.h 2013-11-06 00:40:52.0 -0500 -+++ vmnet-only.new/vm_assert.h 2014-10-07 18:14:05.167816273 -0400 -@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou +--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400 vmnet-only.new/vm_assert.h 2014-10-09 21:52
[gentoo-commits] proj/vmware:master commit in: /
commit: d9b8fa2a1c793bf4c71f2e4915f3a3d7cfcd98b3 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 20:47:05 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 20:47:05 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=d9b8fa2a Merge branch 'master' of git://git.overlays.gentoo.org/proj/vmware eclass/vmware-bundle.eclass | 76 eclass/vmware.eclass| 416 profiles/package.mask | 7 - 3 files changed, 499 deletions(-)
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: a47d968589d7559e72d5f8cc4e957ea3b9fb78d2 Author: Evan Teran evan.teran AT gmail DOT com AuthorDate: Thu Oct 9 21:20:45 2014 + Commit: Evan Teran evan.teran AT gmail DOT com CommitDate: Thu Oct 9 21:20:45 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a47d9685 compiles with 3.12/3.13, moving onto 3.14 --- .../vmware-modules/files/271-3.13-00-vmnet.patch | 36 ++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch new file mode 100644 index 000..4e9d7e9 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch @@ -0,0 +1,36 @@ +--- work/vmnet-only/filter.c 2013-08-27 20:29:04.0 +0100 patched/vmnet-only/filter.c 2014-01-26 01:09:05.184893854 + +@@ -27,6 +27,7 @@ + #include compat_module.h + #include linux/mutex.h + #include linux/netdevice.h ++#include linux/version.h + #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0) + # include linux/module.h + #else +@@ -203,7 +204,11 @@ + #endif + + static unsigned int ++#if LINUX_VERSION_CODE KERNEL_VERSION(3, 13, 0) + VNetFilterHookFn(unsigned int hooknum, // IN: ++#else ++VNetFilterHookFn(const struct nf_hook_ops *ops,// IN: ++#endif + #ifdef VMW_NFHOOK_USES_SKB + struct sk_buff *skb, // IN: + #else +@@ -252,7 +257,12 @@ + +/* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */ +/* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */ +- transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ ++ #if LINUX_VERSION_CODE KERNEL_VERSION(3, 13, 0) ++ transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ #else ++ transmit = (ops-hooknum == VMW_NF_INET_POST_ROUTING); ++ #endif + +packetHeader = compat_skb_network_header(skb); +ip = (struct iphdr*)packetHeader; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 7b2771a..e922472 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -80,7 +80,7 @@ src_prepare() { kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch kernel_is ge 3 11 0 epatch ${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch - + kernel_is ge 3 13 0 epatch ${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch