diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2008-06-18 09:18:03 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2008-06-18 09:18:03 +0000 |
| commit | 607f50137f4448c2908e91dc3348316d092f0bfb (patch) | |
| tree | f93606245167df3c565f95cc1cf444225148da25 | |
| parent | Version bump. (diff) | |
| download | gentoo-2-607f50137f4448c2908e91dc3348316d092f0bfb.tar.gz gentoo-2-607f50137f4448c2908e91dc3348316d092f0bfb.tar.bz2 gentoo-2-607f50137f4448c2908e91dc3348316d092f0bfb.zip | |
Fix kernel build directories (bug 227941).
(Portage version: 2.2_pre8/cvs/Linux 2.6.25-gentoo-r4 i686)
3 files changed, 56 insertions, 2 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index 52e99875680f..04565dfd484d 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.31 2008/06/15 09:40:05 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.32 2008/06/18 09:18:03 ikelos Exp $ + + 18 Jun 2008; Mike Auty <ikelos@gentoo.org> + +files/1.0.0.20-makefile-kernel-dir.patch, vmware-modules-1.0.0.20.ebuild: + Fix kernel build directories (bug 227941). *vmware-modules-1.0.0.20 (14 Jun 2008) diff --git a/app-emulation/vmware-modules/files/1.0.0.20-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.20-makefile-kernel-dir.patch new file mode 100644 index 000000000000..7197cf8154d3 --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.20-makefile-kernel-dir.patch @@ -0,0 +1,48 @@ +diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile +index e7d18b5..02e2cf3 100644 +--- a/vmblock-only/Makefile ++++ b/vmblock-only/Makefile +@@ -14,9 +14,9 @@ SRCROOT = . + 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 + +diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile +index 1707ffc..165da0a 100644 +--- a/vmmon-only/Makefile ++++ b/vmmon-only/Makefile +@@ -14,9 +14,9 @@ SRCROOT = . + 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 + +diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile +index cd24c8c..a085f96 100644 +--- a/vmnet-only/Makefile ++++ b/vmnet-only/Makefile +@@ -14,9 +14,9 @@ SRCROOT = . + 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 + diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.20.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.20.ebuild index 0a54a63cbf88..59894970bf93 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.20.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.20.ebuild,v 1.1 2008/06/14 23:11:19 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.20.ebuild,v 1.2 2008/06/18 09:18:03 ikelos Exp $ KEYWORDS="~amd64 ~x86" VMWARE_VER="VME_V604" # THIS VALUE IS JUST A PLACE HOLDER @@ -16,4 +16,6 @@ src_unpack() { vmware-mod_src_unpack cd "${S}/vmblock-only" epatch "${FILESDIR}/patches/vmblock/010_all_kernel-2.6.25.patch" + cd "${S}" + epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" } |