diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 57e04cbd3..9dcf77c4d 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,6 +1,11 @@ AUX 1.0.0.26-makefile-include.patch 2873 RMD160 2313761dc064d066ab912af294fc95bb462ff05e SHA1 2deae503f8c169c23b228981593996b03367b609 SHA256 d870c2f507c430adce76c251fa1c107cce512b38eaeacda9f1ffee485c02c02c AUX 1.0.0.26-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f +AUX 1.0.0.27-makefile-include.patch 2873 RMD160 2313761dc064d066ab912af294fc95bb462ff05e SHA1 2deae503f8c169c23b228981593996b03367b609 SHA256 d870c2f507c430adce76c251fa1c107cce512b38eaeacda9f1ffee485c02c02c +AUX 1.0.0.27-makefile-kernel-dir.patch 2771 RMD160 d578e9cb5fd0f2052b9e4299aa56e00fc1d613ad SHA1 c1be53b611cbe35aa2b638d2291b7955203e60e4 SHA256 7ad4d8777d795417a9f7d700a698c05448888802d6ba1f925748c8877517d9f3 AUX vmware-2.6.35-compile.patch 8567 RMD160 c5cbf53d12e95d060e511384a6b86708f2408644 SHA1 f8e80c73728b6798918510b9c25dea1ad7bde5c4 SHA256 86b9fbafdc8937dbd3a01479e11dfda81648b5f74bf6f588fea393925381db80 DIST vmware-modules-1.0.0.26.amd64.tar.bz2 630368 RMD160 d3321edf23598493a937d71c9d3200921b05a13e SHA1 eed55d8b267af74d05e1a3eab150fa35cbfdf1ba SHA256 8fd323c39c62bf4995ab34b7b544344ac79740d4bd647bf89cd7fb24a6cdf898 DIST vmware-modules-1.0.0.26.x86.tar.bz2 630339 RMD160 c04ec66c0fda191337a35f9447776584ca34ffff SHA1 2329f085405a79121a973f125564ca9d99a3c9cb SHA256 08df4bfb19cda7ba5eb4cf11b7f8a88bd8750db712e45116eb0a0d9895644a82 +DIST vmware-modules-1.0.0.27.amd64.tar.bz2 639095 RMD160 445acdbb14b7313a3f1c32447ec5eed6aca5f5a5 SHA1 c7b9fc709fe6cf762c2d154afa4f743ea0283429 SHA256 a7669755bd3fa7b6f53340556f7f98c64a4596a91b02e0c1d50af5b8a1e16914 +DIST vmware-modules-1.0.0.27.x86.tar.bz2 639481 RMD160 29ea79354a3f3c6bd06d9126540a027a537ba914 SHA1 509b700de8d83f3a9f5a71d26edb281821ed9530 SHA256 af50303e25ea031c965a6fbf80e5b4bbe3e438925d0b723b0cf96fedc1457fb6 EBUILD vmware-modules-1.0.0.26-r1.ebuild 2008 RMD160 7bd29c82beb921e1d79ffd566574f24ad94440d7 SHA1 647c74b77d56de3e22b98697947bc51be0c140a0 SHA256 13b4892686cdc5fc333e1a56924571ca87c9de29482921180ab3be41737b5ea5 +EBUILD vmware-modules-1.0.0.27.ebuild 2008 RMD160 7bd29c82beb921e1d79ffd566574f24ad94440d7 SHA1 647c74b77d56de3e22b98697947bc51be0c140a0 SHA256 13b4892686cdc5fc333e1a56924571ca87c9de29482921180ab3be41737b5ea5 diff --git a/app-emulation/vmware-modules/files/1.0.0.27-makefile-include.patch b/app-emulation/vmware-modules/files/1.0.0.27-makefile-include.patch new file mode 100644 index 000000000..a19dc2ed2 --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.27-makefile-include.patch @@ -0,0 +1,60 @@ +diff -Naur old/vmblock-only/Makefile.kernel work/vmblock-only/Makefile.kernel +--- old/vmblock-only/Makefile.kernel 2010-01-23 01:09:08.000000000 +0000 ++++ work/vmblock-only/Makefile.kernel 2010-02-08 16:25:28.000000000 +0000 +@@ -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 -Naur old/vmci-only/Makefile.kernel work/vmci-only/Makefile.kernel +--- old/vmci-only/Makefile.kernel 2010-01-23 04:19:55.000000000 +0000 ++++ work/vmci-only/Makefile.kernel 2010-02-08 16:26:16.000000000 +0000 +@@ -21,7 +21,7 @@ + + 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 -Naur old/vmmon-only/Makefile.kernel work/vmmon-only/Makefile.kernel +--- old/vmmon-only/Makefile.kernel 2010-01-23 04:19:52.000000000 +0000 ++++ work/vmmon-only/Makefile.kernel 2010-02-08 16:26:29.000000000 +0000 +@@ -22,7 +22,7 @@ + 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 -Naur old/vmnet-only/Makefile.kernel work/vmnet-only/Makefile.kernel +--- old/vmnet-only/Makefile.kernel 2010-01-23 04:19:54.000000000 +0000 ++++ work/vmnet-only/Makefile.kernel 2010-02-08 16:27:34.000000000 +0000 +@@ -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 -Naur old/vsock-only/Makefile.kernel work/vsock-only/Makefile.kernel +--- old/vsock-only/Makefile.kernel 2010-01-23 01:09:09.000000000 +0000 ++++ work/vsock-only/Makefile.kernel 2010-02-08 16:28:22.000000000 +0000 +@@ -25,7 +25,7 @@ + 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.27-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.27-makefile-kernel-dir.patch new file mode 100644 index 000000000..04156a22f --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.27-makefile-kernel-dir.patch @@ -0,0 +1,75 @@ +diff -Naur vmware-modules-1.0.0.27.orig/vmblock-only/Makefile vmware-modules-1.0.0.27/vmblock-only/Makefile +--- vmware-modules-1.0.0.27.orig/vmblock-only/Makefile 2010-08-01 18:16:43.000000000 +0200 ++++ vmware-modules-1.0.0.27/vmblock-only/Makefile 2010-09-15 00:17:12.640239926 +0200 +@@ -46,9 +46,9 @@ + 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 -Naur vmware-modules-1.0.0.27.orig/vmci-only/Makefile vmware-modules-1.0.0.27/vmci-only/Makefile +--- vmware-modules-1.0.0.27.orig/vmci-only/Makefile 2010-08-01 20:51:29.000000000 +0200 ++++ vmware-modules-1.0.0.27/vmci-only/Makefile 2010-09-15 00:17:12.640239926 +0200 +@@ -46,9 +46,9 @@ + 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 -Naur vmware-modules-1.0.0.27.orig/vmmon-only/Makefile vmware-modules-1.0.0.27/vmmon-only/Makefile +--- vmware-modules-1.0.0.27.orig/vmmon-only/Makefile 2010-08-01 20:51:26.000000000 +0200 ++++ vmware-modules-1.0.0.27/vmmon-only/Makefile 2010-09-15 00:17:12.641239367 +0200 +@@ -46,9 +46,9 @@ + 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 -Naur vmware-modules-1.0.0.27.orig/vmnet-only/Makefile vmware-modules-1.0.0.27/vmnet-only/Makefile +--- vmware-modules-1.0.0.27.orig/vmnet-only/Makefile 2010-08-01 20:51:27.000000000 +0200 ++++ vmware-modules-1.0.0.27/vmnet-only/Makefile 2010-09-15 00:17:12.641239367 +0200 +@@ -46,9 +46,9 @@ + 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 -Naur vmware-modules-1.0.0.27.orig/vsock-only/Makefile vmware-modules-1.0.0.27/vsock-only/Makefile +--- vmware-modules-1.0.0.27.orig/vsock-only/Makefile 2010-08-01 18:16:43.000000000 +0200 ++++ vmware-modules-1.0.0.27/vsock-only/Makefile 2010-09-15 00:17:12.641239367 +0200 +@@ -46,9 +46,9 @@ + 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.27.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.27.ebuild new file mode 100644 index 000000000..987003cc2 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.27.ebuild @@ -0,0 +1,78 @@ +# 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 $ + +EAPI="2" + +inherit eutils flag-o-matic linux-mod linux-info + +DESCRIPTION="VMware kernel modules" +HOMEPAGE="http://www.vmware.com/" + +SRC_URI="x86? ( + http://dev.pentoo.ch/~grimmlin/vmware/${P}.x86.tar.bz2 + mirror://gentoo/${P}.x86.tar.bz2 + http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2 + ) + amd64? ( + http://dev.pentoo.ch/~grimmlin/vmware/${P}.amd64.tar.bz2 + 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_V70" # THIS VALUE IS JUST A PLACE HOLDER + 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}-makefile-include.patch" + if kernel_is -ge 2 6 35; then + epatch "${FILESDIR}"/vmware-2.6.35-compile.patch + fi +} + +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 +}