From 6d74268b4ec54a0b1c49177d300fc7a5802523d9 Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Sun, 28 Feb 2010 17:51:16 +0000 Subject: [PATCH] vmware-modules for VMware Workstation 7.0.x and Player 3.0.x Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- app-emulation/vmware-modules/ChangeLog | 10 ++- app-emulation/vmware-modules/Manifest | 8 +- .../files/1.0.0.26-makefile-include.patch | 65 +++++++++++++++ .../files/1.0.0.26-makefile-kernel-dir.patch | 80 +++++++++++++++++++ ....ebuild => vmware-modules-1.0.0.26.ebuild} | 5 +- 5 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch create mode 100644 app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch rename app-emulation/vmware-modules/{vmware-modules-1.0.0.25.ebuild => vmware-modules-1.0.0.26.ebuild} (93%) diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index f77440513ebc..2ccef8206b58 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.55 2010/02/26 14:54:32 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.56 2010/02/28 17:51:15 vadimk Exp $ + +*vmware-modules-1.0.0.26 (28 Feb 2010) + + 28 Feb 2010; Vadim Kuznetsov + +files/1.0.0.26-makefile-include.patch, -vmware-modules-1.0.0.25.ebuild, + +files/1.0.0.26-makefile-kernel-dir.patch, + +vmware-modules-1.0.0.26.ebuild: + vmware-modules for VMware Workstation 7.0.x and Player 3.0.x 26 Feb 2010; Vadim Kuznetsov +files/1.0.0.24-autoconf-generated.patch, diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index d7f2b36f6cb0..bb609359c219 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -6,6 +6,8 @@ AUX 1.0.0.24-vmnet-2.6.31.patch 13974 RMD160 84af8197b341ccea2fdda39225f9259ccdb AUX 1.0.0.25-autoconf-generated.patch 17674 RMD160 38343d24d8cdfd7e312f3e60cf87f7236da6df22 SHA1 6e427c26f1a1efafff4a1c8623ef9ada874540e5 SHA256 d35b879cb950373939d3cef32e56be87f5b216ece3fe12af5e04c2c7c146a394 AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f +AUX 1.0.0.26-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c +AUX 1.0.0.26-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e @@ -21,10 +23,12 @@ DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e9 DIST vmware-modules-1.0.0.24.x86.tar.bz2 487178 RMD160 9dd4aa6ecabe1ff1621e0a7a9c573479ab92df3c SHA1 e861a6c2d33193a57226a9be562e9e7a1926e45f SHA256 0021b2eefdfb2de3d352d70f84f1e9ec3d375e1073c5f960435208cf3ee2409e DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7 DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8 +DIST vmware-modules-1.0.0.26.amd64.tar.bz2 630507 RMD160 99008f4bac64b142b826237da51421ca9795f98a SHA1 2d02449e870fceb4ef3673cf36a44f964615f672 SHA256 acb2c09b69bb4bbcaf4ddb780f866350acb76ef5fee5696ab66db5bcc5ecd7a2 +DIST vmware-modules-1.0.0.26.x86.tar.bz2 630393 RMD160 f43fd73be421cac84a1b04f1bd2d864db5617206 SHA1 6341733ac047127e4c9a555fcc3c41b936729cda SHA256 72b274e9a6261c218ff2ff21b1264c598d25eebc7eb6928c8c578b4f41669e4a 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 1996 RMD160 fa3489c03b4969c8dc13ef1abbbc0f5f2f51abbd SHA1 e9aafc9139cfaa99710a9bbe3932c282e986de7b SHA256 ae120390719de2d88368ca6721edfa7b06e638dfa2f68d03a8e733a1962caffc EBUILD vmware-modules-1.0.0.25-r1.ebuild 1892 RMD160 3f278d97838aef8a9c9d386bbf4b39daf29b5af4 SHA1 a50ef9d741c4e67215010146e3b2b0691fc09b8c SHA256 43aea0c0fc63e20ebe2af19d2ff7d002fd47d770598a2b8a20f995254e703ad7 -EBUILD vmware-modules-1.0.0.25.ebuild 1836 RMD160 2db7cf340cc42c7e2d10942d4805279f00c301e4 SHA1 33ec3c9815d90b21d816e7caa5925d92a2a746d5 SHA256 bfa9342bc2c3ca654e35ab3e441880d001b70f45c22e72a7f5129dbf99609847 -MISC ChangeLog 12484 RMD160 8a1174760c7d434670b4aa05b7ba3237341ccaaa SHA1 4e4b44875172b2033f43940156874496cbc82bd2 SHA256 e8a261e2fc12f790df7b9d766c270e4844dd6e6b52ac0fff7d730538a6fa7152 +EBUILD vmware-modules-1.0.0.26.ebuild 1795 RMD160 8792d7ae6dfa7a0bef0950d900616017c0236216 SHA1 b7ae00e1ee2bb5c4ea93ee69ae687a267fef875a SHA256 e8af1248e05799a0dc444318b64d01d5c9e5445dd2c2a09a2b029b7d9e761d11 +MISC ChangeLog 12794 RMD160 36c1353c34cdee3add2c6787e6d17fb12eb45a14 SHA1 334c580467ecf96b3f9de9442573f7a07bbec085 SHA256 88ddf588d1d1be394359c64afe9f7c852bd186bd2a9bc4e0ed9f8fd12455facb MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 diff --git a/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch b/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch new file mode 100644 index 000000000000..777a3fd8bb6f --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch @@ -0,0 +1,65 @@ +diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel +index 9d7c5ca..92cefff 100644 +--- a/work/vmblock-only/Makefile.kernel ++++ b/work/vmblock-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE += -I$(SRCROOT)/include + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, ) +diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel +index 22dc232..67e709f 100644 +--- a/work/vmci-only/Makefile.kernel ++++ b/work/vmci-only/Makefile.kernel +@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI + + INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) + +diff --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel +index a7e26ea..befaca7 100644 +--- a/work/vmmon-only/Makefile.kernel ++++ b/work/vmmon-only/Makefile.kernel +@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE + INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ + -I$(SRCROOT)/vmcore + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, ) +diff --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel +index 4b16d06..0e252a6 100644 +--- a/work/vmnet-only/Makefile.kernel ++++ b/work/vmnet-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE := -I$(SRCROOT) + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) +diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel +index 47ef5f3..b3539ef 100644 +--- a/work/vsock-only/Makefile.kernel ++++ b/work/vsock-only/Makefile.kernel +@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include + INCLUDE += -I$(SRCROOT)/linux + INCLUDE += -I$(SRCROOT)/common + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, ) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) + diff --git a/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch new file mode 100644 index 000000000000..d4bd6d12fed0 --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch @@ -0,0 +1,80 @@ +diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile +index 0bd0e74..27c3ede 100644 +--- a/work/vmblock-only/Makefile ++++ b/work/vmblock-only/Makefile +@@ -46,9 +46,9 @@ endif + VM_UNAME = $(shell uname -r) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmblock + PRODUCT := tools +diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile +index 7babb8a..fbc5878 100644 +--- a/work/vmci-only/Makefile ++++ b/work/vmci-only/Makefile +@@ -46,9 +46,9 @@ endif + VM_UNAME = $(shell uname -r) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmci + PRODUCT := @@PRODUCT@@ +diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile +index 4b4eb3e..1bb35ef 100644 +--- a/work/vmmon-only/Makefile ++++ b/work/vmmon-only/Makefile +@@ -46,9 +46,9 @@ endif + VM_UNAME = $(shell uname -r) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmmon + PRODUCT := @@PRODUCT@@ +diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile +index 06856e7..fd53bf8 100644 +--- a/work/vmnet-only/Makefile ++++ b/work/vmnet-only/Makefile +@@ -46,9 +46,9 @@ endif + VM_UNAME = $(shell uname -r) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmnet + PRODUCT := @@PRODUCT@@ +diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile +index e02adb0..210e502 100644 +--- a/work/vsock-only/Makefile ++++ b/work/vsock-only/Makefile +@@ -46,9 +46,9 @@ endif + VM_UNAME = $(shell uname -r) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vsock + PRODUCT := ws diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild similarity index 93% rename from app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild rename to app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild index 64068c6e2ba2..ac6194f549dd 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.5 2010/01/02 20:07:47 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.1 2010/02/28 17:51:15 vadimk Exp $ EAPI="2" @@ -20,7 +20,7 @@ SRC_URI="x86? ( LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="" @@ -58,7 +58,6 @@ 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() { -- 2.26.2