diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2010-01-02 20:07:48 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2010-01-02 20:07:48 +0000 |
| commit | 0c2496ae63b344ddbd02629b6d331b4de1c09a7a (patch) | |
| tree | 210c101661f8db7540090dc9b3078a30f247a0ed /app-emulation/vmware-modules | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-0c2496ae63b344ddbd02629b6d331b4de1c09a7a.tar.gz historical-0c2496ae63b344ddbd02629b6d331b4de1c09a7a.tar.bz2 historical-0c2496ae63b344ddbd02629b6d331b4de1c09a7a.zip | |
Bug 295955
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/vmware-modules')
6 files changed, 39 insertions, 85 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index 832e1765b179..2b71e2e91937 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/vmware-modules -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.52 2009/10/30 18:43:11 vadimk Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.53 2010/01/02 20:07:47 vadimk Exp $ + + 02 Jan 2010; Vadim Kuznetsov <vadimk@gentoo.org> + -vmware-modules-1.0.0.24.ebuild, vmware-modules-1.0.0.24-r1.ebuild, + vmware-modules-1.0.0.25.ebuild, +files/sched_h-2.6.32.patch: + Bug 295955 30 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org -files/1.0.0.23-makefile-kernel-dir.patch, diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index f0f095b9c329..f236cab38577 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -13,6 +13,7 @@ AUX patches/vmmon/040_all_kernel-2.6.27.patch 17842 RMD160 b0caa9c331e46d30383d4 AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5701b831035853d9e SHA1 a3e714383be2e0abbc434d5f3ef5253b72978c81 SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17 AUX patches/vmnet/030_all_kernel-2.6.27.patch 2558 RMD160 9ba251de06852c33e4530628679bdf36ea8051bd SHA1 0078be861f34d4b8def9fcf38385e8c335cbc909 SHA256 b4bc5e5c1030bd5341ef60500dece1d0b6b1f4e553cb566c1ba5506ed6dbb03f +AUX sched_h-2.6.32.patch 819 RMD160 99c136ee407b892f018a9899944c73de11a6fc17 SHA1 1cd7ace0046185c069bee3f47003c7fd7a931766 SHA256 925310d18016bc5638c6a9cc8888b5b2dd5d884890386a358c6f6f527788aaa4 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e901021a86433efeed8 SHA1 bbbf3974afcb77fa0a670ac7821382a725cc6e4e SHA256 d010d0797bc303d2e3a69efc17dca56d3e3de5c43028c780334c57c69606ab94 DIST vmware-modules-1.0.0.24.x86.tar.bz2 487178 RMD160 9dd4aa6ecabe1ff1621e0a7a9c573479ab92df3c SHA1 e861a6c2d33193a57226a9be562e9e7a1926e45f SHA256 0021b2eefdfb2de3d352d70f84f1e9ec3d375e1073c5f960435208cf3ee2409e @@ -20,8 +21,7 @@ DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3 DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d -EBUILD vmware-modules-1.0.0.24-r1.ebuild 1900 RMD160 4ecd9e1cbdf1540e595ffbd77af671cf5143b35b SHA1 65f1a25a5b3fd9ae83ca42f70b27e4de9719eceb SHA256 a60807b87c55cc00b2e8cd14dcf31d2a1c20f5a696fe5b70d4d404022f0f1b75 -EBUILD vmware-modules-1.0.0.24.ebuild 1869 RMD160 365eaf6f73a6bc3a9fb89104124fd31760dd3c2f SHA1 f36147072ac47de26f64153b834fcf553bfaf1f8 SHA256 5f7c3ac912d9d1c95c49d946c5f16639967a1e4ebaeae5ef5d0c5910cd89ab2f -EBUILD vmware-modules-1.0.0.25.ebuild 1793 RMD160 5b36d8f0a01f6fb3e2a7a460653c1cb6396a70d2 SHA1 22e822a696351e3d8ed85012f1e6303a129b4e5a SHA256 db4ec242ebeef6debeb116c2d6aac46a341bf8131719cfa3171ee02459f4207b -MISC ChangeLog 11876 RMD160 f2d50c194311dacef9578ac5b13049b9ca9f3183 SHA1 0351aa861b1345d9153cfcc030c71f2ff8e3949a SHA256 a4c9823c15cedc5294979238ed73e7dcdbd3adbf473ab970fca2a54d027a10b1 +EBUILD vmware-modules-1.0.0.24-r1.ebuild 1943 RMD160 56bcb03db986f8fa58c97acb4b15af2736c26073 SHA1 30acb5c3efdf7b0e517e3bc052786d782dff809a SHA256 c861825ccf2bc3cdee8abb4bafa43df146a7a639ca02c347f10157acbc13e060 +EBUILD vmware-modules-1.0.0.25.ebuild 1836 RMD160 2db7cf340cc42c7e2d10942d4805279f00c301e4 SHA1 33ec3c9815d90b21d816e7caa5925d92a2a746d5 SHA256 bfa9342bc2c3ca654e35ab3e441880d001b70f45c22e72a7f5129dbf99609847 +MISC ChangeLog 12074 RMD160 b5f0546e0623079e55ef6b3fdecde74592c64faa SHA1 bb199e9dd11ed936ae53ae023891280d6283705b SHA256 c24b3776124474d9fdddb522ad2d720b54046187c137a1e67671ba6bcfa1b84a MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 diff --git a/app-emulation/vmware-modules/files/sched_h-2.6.32.patch b/app-emulation/vmware-modules/files/sched_h-2.6.32.patch new file mode 100644 index 000000000000..b7333f7f8541 --- /dev/null +++ b/app-emulation/vmware-modules/files/sched_h-2.6.32.patch @@ -0,0 +1,22 @@ +diff -ur vmci-only.before/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c +--- vmci-only.before/linux/vmciKernelIf.c 2010-01-02 14:56:31.000000000 -0500 ++++ vmci-only/linux/vmciKernelIf.c 2010-01-02 14:57:01.000000000 -0500 +@@ -36,6 +36,7 @@ + #include "compat_module.h" + + #include "compat_version.h" ++#include "compat_sched.h" + #include "compat_wait.h" + #include "compat_interrupt.h" + #include "compat_spinlock.h" +diff -ur vmnet-only.before/vnetUserListener.c vmnet-only/vnetUserListener.c +--- vmnet-only.before/vnetUserListener.c 2010-01-02 14:56:38.000000000 -0500 ++++ vmnet-only/vnetUserListener.c 2010-01-02 14:58:29.000000000 -0500 +@@ -32,6 +32,7 @@ + #include <linux/netdevice.h> + #include <linux/poll.h> + #include "compat_skbuff.h" ++#include "compat_sched.h" + #include "compat_wait.h" + #include "vnetInt.h" + diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild index e7ef1b7af8a8..af62e31863ed 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.1 2009/09/22 17:56:21 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.2 2010/01/02 20:07:47 vadimk Exp $ EAPI="2" @@ -60,6 +60,7 @@ src_prepare() { epatch "${FILESDIR}/${PV}-kernel-2.6.29.patch" epatch "${FILESDIR}/${PV}-kernel-2.6.30.patch" epatch "${FILESDIR}/${PV}-vmnet-2.6.31.patch" + epatch "${FILESDIR}/sched_h-2.6.32.patch" } src_install() { diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild deleted file mode 100644 index b47f8dbdccc4..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild,v 1.2 2009/06/14 21:49:47 mr_bones_ Exp $ - -EAPI="2" - -inherit eutils flag-o-matic linux-mod - -DESCRIPTION="VMware kernel modules" -HOMEPAGE="http://www.vmware.com/" - -SRC_URI="x86? ( - mirror://gentoo/${P}.x86.tar.bz2 - http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2 - ) - amd64? ( - mirror://gentoo/${P}.amd64.tar.bz2 - http://dev.gentoo.org/~vadimk/${P}.amd64.tar.bz2 - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER -# PATCH_VER="1" - VMWARE_GROUP=${VMWARE_GROUP:-vmware} - - VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock" - VMWARE_MOD_DIR="${PN}-${PVR}" - - BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} 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() { - unpack ${A} - cd "${S}" - for mod in ${VMWARE_MODULE_LIST}; do - unpack ./"${P}"/${mod}.tar - done -} - -src_prepare() { - epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" - epatch "${FILESDIR}/${PV}-kernel-2.6.29.patch" - epatch "${FILESDIR}/${PV}-kernel-2.6.30.patch" -} - -src_install() { - # this adds udev rules for vmmon* - if [[ -n "`echo ${VMWARE_MODULE_LIST} | grep vmmon`" ]]; - then - dodir /etc/udev/rules.d - echo 'KERNEL=="vmmon*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die - echo 'KERNEL=="vmnet*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die - fi - - linux-mod_src_install -} diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild index 20e69c9c80ef..64068c6e2ba2 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.4 2009/09/25 10:35:55 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.5 2010/01/02 20:07:47 vadimk Exp $ EAPI="2" @@ -58,6 +58,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" epatch "${FILESDIR}/${PV}-makefile-include.patch" + epatch "${FILESDIR}/sched_h-2.6.32.patch" } src_install() { |