SOURCES: VMware-player-Makefile.patch, vmware-any-any-update115-to...

[twittner]

Author: twittner                     Date: Mon Mar 31 16:19:02 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- allow to compile with kernels >= 2.6.24
- rel. 0.14

---- Files affected:
SOURCES:
   VMware-player-Makefile.patch (1.2 -> 1.3) , vmware-any-any-update115-to-115a.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/VMware-player-Makefile.patch
diff -u SOURCES/VMware-player-Makefile.patch:1.2 SOURCES/VMware-player-Makefile.patch:1.3
--- SOURCES/VMware-player-Makefile.patch:1.2	Mon Dec 17 01:35:07 2007
+++ SOURCES/VMware-player-Makefile.patch	Mon Mar 31 18:18:56 2008
@@ -1,5 +1,5 @@
---- vmware-player-distrib/vmware-any-any-update115/vmmon-only/Makefile	2007-11-28 12:39:37.000000000 +0200
-+++ vmware-player-distrib-new/vmware-any-any-update115/vmmon-only/Makefile	2007-12-17 02:21:20.665830641 +0200
+--- vmware-player-distrib/vmware-any-any-update115a/vmmon-only/Makefile	2007-11-28 12:39:37.000000000 +0200
++++ vmware-player-distrib-new/vmware-any-any-update115a/vmmon-only/Makefile	2007-12-17 02:21:20.665830641 +0200
 @@ -15,9 +15,9 @@
  VM_UNAME = $(shell uname -r)
  
@@ -102,8 +102,8 @@
  else
  
  include $(SRCROOT)/Makefile.normal
---- vmware-player-distrib/vmware-any-any-update115/vmnet-only/Makefile	2007-11-28 12:19:12.000000000 +0200
-+++ vmware-player-distrib-new/vmware-any-any-update115/vmnet-only/Makefile	2007-12-17 02:19:06.321685076 +0200
+--- vmware-player-distrib/vmware-any-any-update115a/vmnet-only/Makefile	2007-11-28 12:19:12.000000000 +0200
++++ vmware-player-distrib-new/vmware-any-any-update115a/vmnet-only/Makefile	2007-12-17 02:19:06.321685076 +0200
 @@ -15,9 +15,9 @@
  VM_UNAME = $(shell uname -r)
  

================================================================
Index: SOURCES/vmware-any-any-update115-to-115a.patch
diff -u /dev/null SOURCES/vmware-any-any-update115-to-115a.patch:1.1
--- /dev/null	Mon Mar 31 18:19:02 2008
+++ SOURCES/vmware-any-any-update115-to-115a.patch	Mon Mar 31 18:18:56 2008
@@ -0,0 +1,25 @@
+diff -Nru vmware-any-any-update115/vmmon-only/include/iocontrols_compat.h vmware-any-any-update115a/vmmon-only/include/iocontrols_compat.h
+--- vmware-any-any-update115/vmmon-only/include/iocontrols_compat.h	2007-07-23 11:59:47.000000000 +0200
++++ vmware-any-any-update115a/vmmon-only/include/iocontrols_compat.h	2007-12-01 16:55:10.000000000 +0100
+@@ -15,7 +15,7 @@
+ #define VMMON_VERSION_V5        (116 << 16 | 0)
+ #define VMMON_VERSION_V55       (137 << 16 | 0)
+ #define VMMON_VERSION_S1B1      (138 << 16 | 0)
+-#define VMMON_VERSION_V6        (161 << 16 | 0)
++#define VMMON_VERSION_V6        (167 << 16 | 0)
+ 
+ /*
+  * Limit structure for CREATE_VM
+diff -Nru vmware-any-any-update115/vmmon-only/include/vcpuset.h vmware-any-any-update115a/vmmon-only/include/vcpuset.h
+--- vmware-any-any-update115/vmmon-only/include/vcpuset.h	2007-07-22 13:21:17.000000000 +0200
++++ vmware-any-any-update115a/vmmon-only/include/vcpuset.h	2007-12-01 16:52:11.000000000 +0100
+@@ -71,7 +71,7 @@
+ #define ffs(x) ffs_x86_64(x)
+ 
+ #elif defined MODULE
+-   #include "asm/bitops.h"
++   #include "linux/bitops.h"
+ #elif defined __APPLE__ && defined KERNEL
+    /* 
+     * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines 
+Files vmware-any-any-update115/vmmon.tar and vmware-any-any-update115a/vmmon.tar differ
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VMware-player-Makefile.patch?r1=1.2&r2=1.3&f=u