Fix kernel build issues.

(Portage version: 2.1.4)

5 files changed, 338 insertions, 4 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 5bbe17fad7b7..318ba0421656 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/open-vm-tools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.1 2007/12/22 17:32:11 ikelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.2 2008/01/28 17:59:29 ikelos Exp $
+
+*open-vm-tools-0.0.20071121.64693-r1 (28 Jan 2008)
+
+  28 Jan 2008; Mike Auty <ikelos@gentoo.org>
+  +files/open-vm-tools-kernel_stdint-soren.patch,
+  +open-vm-tools-0.0.20071121.64693-r1.ebuild:
+  Fix kernel build issues.
 
 *open-vm-tools-0.0.20071121.64693 (22 Dec 2007)
 
diff --git a/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1 b/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1
new file mode 100644
index 000000000000..6dfad2de76b7
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1
@@ -0,0 +1,3 @@
+MD5 1cc034f14769375f41f6410d709dacbc open-vm-tools-2007.11.21-64693.tar.gz 2295022
+RMD160 e166040e713f4b7f8fae835862128a7ec3fdca75 open-vm-tools-2007.11.21-64693.tar.gz 2295022
+SHA256 b00530bf578b07127880ad3107b2b98873d3e5f74876dd94644bac3883be4431 open-vm-tools-2007.11.21-64693.tar.gz 2295022
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch b/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch
new file mode 100644
index 000000000000..994600115243
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch
@@ -0,0 +1,185 @@
+diff -u open-vm-tools-2007.11.21-64693/debian/changelog open-vm-tools-2007.11.21-64693/debian/changelog
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmblock/include/driver-config.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmblock/include/driver-config.h
+@@ -59,6 +59,11 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
++/* Prevent uintptr_t from being declared in vm_basic_types.h. */
++#define _STDINT_H 1
++#endif
++
+ #ifndef __KERNEL__
+ #define __KERNEL__
+ #endif
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpNameLite.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpNameLite.c
+@@ -25,8 +25,8 @@
+  *
+  */
+ 
+-#include "vm_assert.h"
+ #include "cpNameLite.h"
++#include "vm_assert.h"
+ 
+ /*
+  *----------------------------------------------------------------------
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpName.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpName.c
+@@ -28,9 +28,9 @@
+ #include <string.h>
+ #endif
+ 
+-#include "vm_assert.h"
+ #include "cpName.h"
+ #include "cpNameInt.h"
++#include "vm_assert.h"
+ 
+ /*
+  *----------------------------------------------------------------------
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpNameLinux.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpNameLinux.c
+@@ -28,9 +28,9 @@
+ #include <memory.h>
+ #endif
+ 
+-#include "vm_assert.h"
+ #include "cpName.h"
+ #include "cpNameInt.h"
++#include "vm_assert.h"
+ 
+ 
+ /*
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/driver-config.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/driver-config.h
+@@ -59,6 +59,11 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
++/* Prevent uintptr_t from being declared in vm_basic_types.h. */
++#define _STDINT_H 1
++#endif
++
+ #ifndef __KERNEL__
+ #define __KERNEL__
+ #endif
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/staticEscape.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/staticEscape.c
+@@ -36,8 +36,8 @@
+ #   endif
+ #endif
+ 
+-#include "vm_assert.h"
+ #include "staticEscape.h"
++#include "vm_assert.h"
+ 
+ 
+ /*
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/fsutil.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/fsutil.c
+@@ -46,8 +46,8 @@
+ #include "fsutil.h"
+ #include "hgfsProto.h"
+ #include "staticEscape.h"
+-#include "vm_assert.h"
+ #include "vm_basic_types.h"
++#include "vm_assert.h"
+ 
+ static struct inode *HgfsInodeLookup(struct super_block *sb,
+                                      ino_t ino);
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/hgfsBd.c
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/hgfsBd.c
+@@ -33,10 +33,10 @@
+ #   include "debug.h"
+ #endif
+ 
+-#include "vm_assert.h"
+ #include "rpcout.h"
+ #include "hgfs.h"     // for common HGFS definitions
+ #include "hgfsBd.h"
++#include "vm_assert.h"
+ 
+ 
+ /*
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/kernelStubs.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/kernelStubs.h
+@@ -28,10 +28,10 @@
+ #define __KERNELSTUBS_H__
+ 
+ #ifdef linux
+-#include "vm_basic_types.h"
+ #include "driver-config.h"
+ #include <linux/kernel.h>
+ #include <linux/string.h>
++#include "vm_basic_types.h"
+ #elif defined(_WIN32)
+ #include "vm_basic_types.h"
+ #include <ntddk.h>   /* kernel memory APIs */
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmmemctl/driver-config.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmmemctl/driver-config.h
+@@ -59,6 +59,11 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
++/* Prevent uintptr_t from being declared in vm_basic_types.h. */
++#define _STDINT_H 1
++#endif
++
+ #ifndef __KERNEL__
+ #define __KERNEL__
+ #endif
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmxnet/driver-config.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmxnet/driver-config.h
+@@ -59,6 +59,11 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
++/* Prevent uintptr_t from being declared in vm_basic_types.h. */
++#define _STDINT_H 1
++#endif
++
+ #ifndef __KERNEL__
+ #define __KERNEL__
+ #endif
+only in patch2:
+unchanged:
+--- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmsync/driver-config.h
++++ open-vm-tools-2007.11.21-64693/modules/linux/vmsync/driver-config.h
+@@ -59,6 +59,11 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
++/* Prevent uintptr_t from being declared in vm_basic_types.h. */
++#define _STDINT_H 1
++#endif
++
+ #ifndef __KERNEL__
+ #define __KERNEL__
+ #endif
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild
new file mode 100644
index 000000000000..464f77377ebc
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild,v 1.1 2008/01/28 17:59:29 ikelos Exp $
+
+inherit pam eutils linux-mod autotools versionator
+
+MY_DATE="$(get_version_component_range 3)"
+MY_BUILD="$(get_version_component_range 4)"
+MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
+MY_P="${PN}-${MY_PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X xinerama"
+DEPEND="
+		virtual/linux-sources
+		sys-apps/ethtool
+		X? (
+			x11-libs/libX11
+			x11-libs/gtk+
+			)
+		xinerama? (
+			x11-libs/libXinerama
+			)
+		!app-emulation/vmware-workstation-tools
+		!app-emulation/vmware-server-tools
+		!app-emulation/vmware-esx-tools
+		"
+
+RDEPEND="${DEPEND/virtual\/linux\-sources/}
+		X? (
+			x11-base/xorg-server
+			x11-drivers/xf86-video-vmware
+			x11-drivers/xf86-input-vmmouse
+		)
+"
+
+VMWARE_MOD_DIR="modules/linux"
+VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
+
+pkg_setup() {
+
+	linux-mod_pkg_setup
+	MODULE_NAMES=""
+	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
+
+	for mod in ${VMWARE_MODULE_LIST};
+	do
+		if [[ "${mod}" == "vmxnet" ]];
+		then
+			MODTARGET="net"
+		else
+			MODTARGET="openvmtools"
+		fi
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
+	done
+
+	ewarn "If you're compiling for a hardened target, please use the hardened"
+	ewarn "toolchain (see bug #200376, comment 18)."
+
+	enewgroup vmware
+
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-kernel_stdint-soren.patch"
+}
+
+src_compile() {
+	econf \
+	$(use_with X x) \
+	$(use_enable xinerama multimon) \
+	|| die "Error: econf failed!"
+
+	linux-mod_src_compile
+
+	emake || die
+}
+
+src_install() {
+
+	linux-mod_src_install
+
+	pamd_mimic_system vmware-guestd auth account
+
+	# Install the various tools
+	cd "${S}"
+	VMWARE_BIN_LIST="hgfsclient xferlogs"
+	VMWARE_SBIN_LIST="guestd checkvm"
+	if use X; then
+		# Fix up the vmware-user tool's name
+		mv vmware-user/vmware-user vmware-user/user
+		mv vmware-user user
+		VMWARE_BIN_LIST="${VMWARE_BIN_LIST} user toolbox"
+	fi
+	for i in ${VMWARE_BIN_LIST}; do
+		newbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
+	done
+	for i in ${VMWARE_SBIN_LIST}; do
+		newsbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
+	done
+
+	dolib libguestlib/.libs/libguestlib.{so.0.0.0,a}
+
+	# Deal with the hgfsmounter
+	into /
+	newsbin hgfsmounter/hgfsmounter mount.vmhgfs
+	fperms u+s /sbin/mount.vmhgfs
+	### FROM THIS POINT ON, into IS SET TO ${ROOT}/ not ${ROOT}/usr !!!
+
+	# Install the /etc/ files
+	exeinto /etc/vmware-tools
+	doexe scripts/linux/*
+	insinto /etc/vmware-tools
+	doins "${FILESDIR}/tools.conf"
+	# Only install this, when X is being used. Else it's useless waste of
+	# ressources when checking continuously for processes that will never appear
+	use X && doins "${FILESDIR}/xautostart.conf"
+	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
+
+	if use X;
+	then
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, you need to do this:"
+		elog "	Add 'vmware-tools' to your default runlevel"
+		elog "	Add the users which should have access to this function"
+		elog "	to the group 'vmware'"
+	fi
+}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild
index ce66991e7503..6e75cc075c76 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693.ebuild,v 1.3 2008/01/28 17:59:29 ikelos Exp $
 
 inherit eutils linux-mod versionator