diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2008-04-26 14:38:54 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2008-04-26 14:38:54 +0000 |
| commit | 70565bd71db929b2b9b8f6d969a870bb7dafea10 (patch) | |
| tree | 6b1a17f440ae35c92d21cdede8250489885e535f /app-emulation/vmware-modules | |
| parent | Should have gone a long time ago (bug #219292, thanks to Jesús Pérez). (diff) | |
| download | gentoo-2-70565bd71db929b2b9b8f6d969a870bb7dafea10.tar.gz gentoo-2-70565bd71db929b2b9b8f6d969a870bb7dafea10.tar.bz2 gentoo-2-70565bd71db929b2b9b8f6d969a870bb7dafea10.zip | |
Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older kernels.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'app-emulation/vmware-modules')
3 files changed, 59 insertions, 1 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index dfc2cf660f96..dce18c44f5be 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,13 @@ # 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.28 2008/01/31 14:49:38 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.29 2008/04/26 14:38:53 ikelos Exp $ + + 26 Apr 2008; Mike Auty <ikelos@gentoo.org> + +files/patches/vmblock/010_all_kernel-2.6.25.patch, + +files/patches/vmmon/035_all_kernel-2.6.25.patch, + +files/patches/vmnet/025_all_kernel-2.6.25.patch: + Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older + kernels. 31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog: Re-sign digestless manifest. diff --git a/app-emulation/vmware-modules/files/patches/vmmon/035_all_kernel-2.6.25.patch b/app-emulation/vmware-modules/files/patches/vmmon/035_all_kernel-2.6.25.patch new file mode 100644 index 000000000000..92f70f9a3b27 --- /dev/null +++ b/app-emulation/vmware-modules/files/patches/vmmon/035_all_kernel-2.6.25.patch @@ -0,0 +1,17 @@ +diff --git a/common/task.c b/common/task.c +index 3111098..8373d07 100644 +--- a/common/task.c ++++ b/common/task.c +@@ -25,7 +25,12 @@ extern "C" { + * we do not need asm/page.h anymore in this file - not surprising, this + * is common file, yes? And Windows do not have page.h, do they? + */ ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) + #define _I386_PAGE_H ++#else ++#define _ASM_X86_PAGE_H ++#endif + /* On Linux, must come before any inclusion of asm/page.h --hpreg */ + #include "hostKernel.h" + #ifdef linux diff --git a/app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch b/app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch new file mode 100644 index 000000000000..a11a362347ec --- /dev/null +++ b/app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch @@ -0,0 +1,34 @@ +diff --git a/filter.c b/filter.c +index 7527fe4..7483c83 100644 +--- a/filter.c ++++ b/filter.c +@@ -12,6 +12,13 @@ + #include <linux/ip.h> + #include "compat_skbuff.h" + #include <linux/netdevice.h> ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++# define NF_IP_LOCAL_OUT NF_INET_LOCAL_OUT ++# define NF_IP_LOCAL_IN NF_INET_LOCAL_IN ++# define NF_IP_POST_ROUTING NF_INET_POST_ROUTING ++#endif ++ + /* + * All this makes sense only if NETFILTER support is configured in our kernel. + */ +diff --git a/vmnetInt.h b/vmnetInt.h +index bf2dff9..483c457 100644 +--- a/vmnetInt.h ++++ b/vmnetInt.h +@@ -78,8 +78,10 @@ + */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 65) + # define SET_SK_DEAD(_sk, _val) (_sk)->dead = (_val) +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) + # define SET_SK_DEAD(_sk, _val) sock_valbool_flag(_sk, SOCK_DEAD, _val) ++#else ++# define SET_SK_DEAD(_sk, _val) sock_set_flag(_sk, SOCK_DEAD) + #endif + + |