From 69176739e782ce2b19efa33f17c66a90a981392e Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Tue, 13 Jan 2009 00:21:34 +0000 Subject: Actually add the patch changes this time... Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 i686 --- app-emulation/vmware-modules/Manifest | 10 +++--- .../patches/vmmon/040_all_kernel-2.6.27.patch | 9 +++-- .../patches/vmnet/030_all_kernel-2.6.27.patch | 39 +++++++++++++--------- 3 files changed, 34 insertions(+), 24 deletions(-) (limited to 'app-emulation') diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index cd834fe61b93..58658a6663b0 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -13,10 +13,10 @@ AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e AUX patches/vmmon/030_all_fix-linux-headers.patch 472 RMD160 164b926b0cf53c1a695e7d9ee3e52c5bc1305443 SHA1 b2e485bd21c4106cccc00293df20bce6917e62a4 SHA256 092254308afc9848fd5cc63fb691ee67103fe6413a20e01a568278153d5e876c AUX patches/vmmon/035_all_kernel-2.6.25.patch 541 RMD160 fb0ec4af96238541ef3d5c6d28436166ccacfe7d SHA1 87b1226bc6b74e35c2945c65c7902c03eafa5058 SHA256 e6bba380c0943ee02b3c19cae340238b0a40614b3f5f840a40516ed05e1d964c -AUX patches/vmmon/040_all_kernel-2.6.27.patch 17774 RMD160 d477896bf50746e8e5c4bc6f9b04b9a45b845cce SHA1 305e00e5d0a8aebdb402ae797f3dea03529e244f SHA256 9044096efd21a7003c63a3c35a2a6de0aa598948a27525b00ef89648a99f9da1 +AUX patches/vmmon/040_all_kernel-2.6.27.patch 17842 RMD160 b0caa9c331e46d30383d49371972f201689c1276 SHA1 908e15eb2b56c680e4385c89a683287c323512d3 SHA256 249733eb7f6341ba1b3135bea8690ef69f1e300baa24cc69cdc5a54b13426f8f AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5701b831035853d9e SHA1 a3e714383be2e0abbc434d5f3ef5253b72978c81 SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17 -AUX patches/vmnet/030_all_kernel-2.6.27.patch 2427 RMD160 0d983187f130d82b724447fab1ebdbc25b500387 SHA1 029a0ebd4ea32dcf2fa00a6ab9bf2a4cf3275b2b SHA256 e284c34e4dff2a1ca54d141eaa90b2886a9aac564e1e886cbabf19a28eda19e2 +AUX patches/vmnet/030_all_kernel-2.6.27.patch 2169 RMD160 4bbd631917544b357652fb6b7d66ac1bf3e46a71 SHA1 51a26ec22e9591bfc82f13d4382f4c59c7f3ebfb SHA256 6bfbaeb9b604012c19490e2c95c2c56d83d87bb5ff6bc4019d4c694289573f5d DIST VMware-player-2.0.4-93057.i386.tar.gz 68617186 RMD160 b0e7934ca27573aac74b4ce5275c207ed0db0661 SHA1 7ae213660f05e7c1e8fa3dd177a8ebe71478b9ac SHA256 59045fa684754b95e3928fbdb9f30c7df25dff4f273e8a235b58edc16d7fafe5 DIST VMware-player-2.0.4-93057.x86_64.tar.gz 33315373 RMD160 5ec83275723067f4a0b554924efaf0ee04346c37 SHA1 edbdfb9e8b25e487b9354583c59e59b293a59719 SHA256 e9e2be069171f33365cba964e966aab7c78b7b6ee551905c62ee1326e867e3e2 DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955 @@ -34,7 +34,7 @@ MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAklr0ZcACgkQu7rWomwgFXpziACfaEsDSi7mtFS5kOX5jXgvijrB -j3wAnjKmCIk7BXcEiTNtQUfFA2jl1Vpf -=LzAH +iEYEARECAAYFAklr3p4ACgkQu7rWomwgFXrkagCePpLndMNjpzeGtbSRBJuWvE5g +R4oAn3KNsRAnAEirTlFR1q7GBb3d/Oe+ +=BM0v -----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch b/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch index e24a1de41a35..f44377760cb5 100644 --- a/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch +++ b/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch @@ -22,15 +22,18 @@ index b9f4f61..7e9c3de 100644 return FALSE; } diff --git a/include/compat_semaphore.h b/include/compat_semaphore.h -index 6514067..b2e399d 100644 +index 6514067..d0da703 100644 --- a/include/compat_semaphore.h +++ b/include/compat_semaphore.h -@@ -2,7 +2,7 @@ +@@ -2,7 +2,11 @@ # define __COMPAT_SEMAPHORE_H__ --#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +#include ++#else + #include ++#endif /* diff --git a/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch b/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch index 7670978b0536..981b78c68eb8 100644 --- a/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch +++ b/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch @@ -1,7 +1,8 @@ -diff -pur vmnet-only.orig/bridge.c vmnet-only/bridge.c ---- vmnet-only.orig/bridge.c 2008-05-10 06:25:56.000000000 +0200 -+++ vmnet-only/bridge.c 2008-10-16 18:36:57.000000000 +0200 -@@ -274,7 +274,7 @@ VNetBridgeDevCompatible(VNetBridge *brid +diff --git a/bridge.c b/bridge.c +index cdf9e0b..700c1a2 100644 +--- a/bridge.c ++++ b/bridge.c +@@ -275,7 +275,7 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge struct net_device *net) // IN: Network device { #ifdef VMW_NETDEV_HAS_NET @@ -10,21 +11,26 @@ diff -pur vmnet-only.orig/bridge.c vmnet-only/bridge.c return 0; } #endif -diff -pur vmnet-only.orig/compat_semaphore.h vmnet-only/compat_semaphore.h ---- vmnet-only.orig/compat_semaphore.h 2008-05-10 06:25:56.000000000 +0200 -+++ vmnet-only/compat_semaphore.h 2008-10-16 18:37:21.000000000 +0200 -@@ -2,7 +2,7 @@ +diff --git a/compat_semaphore.h b/compat_semaphore.h +index a3a88c2..c3038d7 100644 +--- a/compat_semaphore.h ++++ b/compat_semaphore.h +@@ -6,7 +6,11 @@ # define __COMPAT_SEMAPHORE_H__ --#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +#include ++#else + #include ++#endif /* -diff -pur vmnet-only.orig/procfs.c vmnet-only/procfs.c ---- vmnet-only.orig/procfs.c 2008-05-10 06:25:56.000000000 +0200 -+++ vmnet-only/procfs.c 2008-10-16 18:36:57.000000000 +0200 +diff --git a/procfs.c b/procfs.c +index 07e894d..73d31e8 100644 +--- a/procfs.c ++++ b/procfs.c @@ -63,7 +63,7 @@ VNetProc_Init(void) { int retval; @@ -43,9 +49,10 @@ diff -pur vmnet-only.orig/procfs.c vmnet-only/procfs.c base = NULL; } -diff -pur vmnet-only.orig/vmnetInt.h vmnet-only/vmnetInt.h ---- vmnet-only.orig/vmnetInt.h 2008-05-10 06:25:56.000000000 +0200 -+++ vmnet-only/vmnetInt.h 2008-10-16 18:36:57.000000000 +0200 +diff --git a/vmnetInt.h b/vmnetInt.h +index 483c457..551be73 100644 +--- a/vmnetInt.h ++++ b/vmnetInt.h @@ -63,7 +63,7 @@ # define dev_lock_list() read_lock(&dev_base_lock) # define dev_unlock_list() read_unlock(&dev_base_lock) @@ -55,7 +62,7 @@ diff -pur vmnet-only.orig/vmnetInt.h vmnet-only/vmnetInt.h # else # define DEV_GET(x) __dev_get_by_name((x)->name) # endif -@@ -89,7 +89,7 @@ +@@ -87,7 +87,7 @@ #ifdef VMW_NETDEV_HAS_NET extern struct proto vmnet_proto; -- cgit v1.2.3-65-gdbad