diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2012-11-17 07:02:12 -0500 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2012-11-17 07:02:12 -0500 |
| commit | d08ee17a821692c9ccaebe49a66e0d6e3a7d6065 (patch) | |
| tree | b9eddc85f2a6d2f36da52c238b68c3a452cee529 /app-emulation/vmware-modules | |
| parent | vmware desktop 9.0.1 version bump (diff) | |
| download | vmware-d08ee17a821692c9ccaebe49a66e0d6e3a7d6065.tar.gz vmware-d08ee17a821692c9ccaebe49a66e0d6e3a7d6065.tar.bz2 vmware-d08ee17a821692c9ccaebe49a66e0d6e3a7d6065.zip | |
kernel dir patch
new file: vmware-modules/files/271-makefile-kernel-dir.patch
modified: vmware-modules/vmware-modules-271.0.ebuild
modified: vmware-modules/vmware-modules-271.1.ebuild
Diffstat (limited to 'app-emulation/vmware-modules')
3 files changed, 87 insertions, 3 deletions
diff --git a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch new file mode 100644 index 0000000..1a647a3 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch @@ -0,0 +1,85 @@ +diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile +index 2b81323..746c8b8 100644 +--- a/vmblock-only/Makefile ++++ b/vmblock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmblock + PRODUCT := ws +diff --git a/vmci-only/Makefile b/vmci-only/Makefile +index 8e9c5be..6ec828b 100644 +--- a/vmci-only/Makefile ++++ b/vmci-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmci + PRODUCT := ws +diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile +index 5bd867b..91a83d4 100644 +--- a/vmmon-only/Makefile ++++ b/vmmon-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmmon + PRODUCT := @@PRODUCT@@ +diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile +index d4eb73c..c7c6d38 100644 +--- a/vmnet-only/Makefile ++++ b/vmnet-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmnet + PRODUCT := @@PRODUCT@@ +diff --git a/vsock-only/Makefile b/vsock-only/Makefile +index 93dd61d..9765696 100644 +--- a/vsock-only/Makefile ++++ b/vsock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vsock + PRODUCT := ws diff --git a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild index 657723d..abcdc18 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild @@ -59,7 +59,7 @@ src_unpack() { } src_prepare() { - #epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" + epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" epatch "${FILESDIR}/${PV_MAJOR}-vmmon.patch" diff --git a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild index c65accb..ae88b23 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild @@ -59,10 +59,9 @@ src_unpack() { } src_prepare() { - #epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" + epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" - #epatch "${FILESDIR}/${PV_MAJOR}-vmmon.patch" use pax_kernel && epatch "${FILESDIR}/hardened.patch" epatch "${FILESDIR}/${PV_MAJOR}-apic.patch" } |