[patch] complete patch against root of overlay

vmware-modules-2.6.27-semaphore.patch (text/plain), 5.74 KB, created by dacook on 2008-11-04 20:15:40 UTC

Index: app-emulation/vmware-modules/files/1.0.0.22-kernel-2.6.27.patch
===================================================================
--- app-emulation/vmware-modules/files/1.0.0.22-kernel-2.6.27.patch	(revision 0)
+++ app-emulation/vmware-modules/files/1.0.0.22-kernel-2.6.27.patch	(revision 0)
@@ -0,0 +1,48 @@
+diff -urN a/vmmon-only/include/compat_semaphore.h b/vmmon-only/include/compat_semaphore.h
+--- a/vmmon-only/include/compat_semaphore.h	2008-10-18 21:09:58.000000000 +0800
++++ b/vmmon-only/include/compat_semaphore.h	2008-10-18 21:16:35.000000000 +0800
+@@ -2,7 +2,7 @@
+ #   define __COMPAT_SEMAPHORE_H__
+ 
+ 
+-#include <asm/semaphore.h>
++#include <linux/semaphore.h>
+ 
+ 
+ /*
+diff -urN a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- a/vmmon-only/linux/hostif.c	2008-10-18 21:09:58.000000000 +0800
++++ b/vmmon-only/linux/hostif.c	2008-10-18 22:07:29.000000000 +0800
+@@ -3421,7 +3421,7 @@
+       }
+    } else {
+       if (linuxState.fastClockThread) {
+-         kill_proc(linuxState.fastClockThread, SIGKILL, 1);
++         kill_pid(linuxState.fastClockThread, SIGKILL, 1);
+          linuxState.fastClockThread = 0;
+          compat_wait_for_completion(&fastClockExited);
+       }
+diff -urN a/vmnet-only/compat_semaphore.h b/vmnet-only/compat_semaphore.h
+--- a/vmnet-only/compat_semaphore.h	2008-10-18 21:09:58.000000000 +0800
++++ b/vmnet-only/compat_semaphore.h	2008-10-18 22:13:21.000000000 +0800
+@@ -2,7 +2,7 @@
+ #   define __COMPAT_SEMAPHORE_H__
+ 
+ 
+-#include <asm/semaphore.h>
++#include <linux/semaphore.h>
+ 
+ 
+ /*
+diff -urN a/vmblock-only/include/compat_semaphore.h b/vmblock-only/include/compat_semaphore.h
+--- a/vmblock-only/include/compat_semaphore.h	2008-11-04 13:01:30.620005807 -0700
++++ b/vmblock-only/include/compat_semaphore.h	2008-11-04 13:02:01.201041175 -0700
+@@ -2,7 +2,7 @@
+ #   define __COMPAT_SEMAPHORE_H__
+ 
+ 
+-#include <asm/semaphore.h>
++#include <linux/semaphore.h>
+ 
+ 
+ /*
Index: app-emulation/vmware-modules/Manifest
===================================================================
--- app-emulation/vmware-modules/Manifest	(revision 314)
+++ app-emulation/vmware-modules/Manifest	(working copy)
@@ -7,6 +7,7 @@
 AUX 1.0.0.20-vmmon-2.6.26.patch 3525 RMD160 820eb2195f9cb2c8ccfc9d544ca578ca6627b6d5 SHA1 0bb56019b59d23e1eaec8e5eb8d81f5f8b4674f2 SHA256 c1d530cd757b85e54274d79e6dd1bb299303108f6307119543ae83742b2d53d5
 AUX 1.0.0.20-vmnet-2.6.26.patch 2420 RMD160 f6d529fc38766330fbd3031a15c5632d8c4f3864 SHA1 44b466bf18b396bee8479d37f18efd4d5f15d359 SHA256 2b52c4dd5b23934179a0e7febd77092ce5f2496116e51c95ebe3f22f73898b5b
 AUX 1.0.0.21-makefile-kernel-dir.patch 1229 RMD160 1439156412ad1fb5f66a75b35571e2bb4701241d SHA1 36857400a40c5526d1f56f513406688d1a081381 SHA256 813abf2e81cee779a255a2607c8731c487e48d5a488fe2c04c386405425173c1
+AUX 1.0.0.22-kernel-2.6.27.patch 1604 RMD160 137460a9b965ecf5896713968ef6220a7d77e809 SHA1 12c61fc82b4bfd92b449b9a3ea35fc229aea72c8 SHA256 5866a1f623cf816c0ae5c56833323403f9f124f7a7f6ad88e046b75a37b2280f
 AUX 1.0.0.22-makefile-kernel-dir.patch 1229 RMD160 1439156412ad1fb5f66a75b35571e2bb4701241d SHA1 36857400a40c5526d1f56f513406688d1a081381 SHA256 813abf2e81cee779a255a2607c8731c487e48d5a488fe2c04c386405425173c1
 AUX 1.0.0.23-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
@@ -35,6 +36,6 @@
 EBUILD vmware-modules-1.0.0.18.ebuild 621 RMD160 cded1e0eb365ce53e41054320850293f2f4d2d0d SHA1 f38941824506ee4024940a01394d6da9a108e28b SHA256 f89c7d3eae7ce74743094b75883faad058946d54ba861f3fe39c5b363c271309
 EBUILD vmware-modules-1.0.0.19.ebuild 793 RMD160 3f07a0dbaa31d7a8f7986d6f42cd4f980b9465e4 SHA1 45521730825d4250675a5493720be6c8ec7861c7 SHA256 decdd9597121c48bd318fab7ddbd74aaa7a2381c5f5383c3d3940648c58fdd64
 EBUILD vmware-modules-1.0.0.20.ebuild 1339 RMD160 7a141661463bffe8b5f4ed91283c03c40603e7a7 SHA1 ed5dd553b59486cbac1ebdf435655c1758550399 SHA256 f35afa34477afbce0c8bccb9d22b1359d4a54dd762866e32cb7b823487a9a066
-EBUILD vmware-modules-1.0.0.22.ebuild 1349 RMD160 83af066da080c92b7baab2022c5757a074db6ba8 SHA1 f8a472a889634f1e350c91203d57eb81b958eb62 SHA256 1dbee31c322fcd203fcc40b864df35ec6e29d13a3ffbccdc490f45badf4f4133
+EBUILD vmware-modules-1.0.0.22.ebuild 1479 RMD160 48c4a3eee200afcb3022f7fb44dbb4d4a8a00e38 SHA1 427886421fb10ab7e45a411e452a280d6439550b SHA256 c5acf7f6d89f86cc088ac0113cb662a270d9db56853c18a50292bbfc763f44a3
 EBUILD vmware-modules-1.0.0.23.ebuild 719 RMD160 6a364998cec1f81d3ae3797b5e30e63f49993ccf SHA1 0cae11f300d1a79461340acfb91c61624fbb5229 SHA256 0b567bfbe9f846eaad26fc711a0cc138e7f2d24ecb49c629d3794ffc8ea12a9e
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
Index: app-emulation/vmware-modules/vmware-modules-1.0.0.22.ebuild
===================================================================
--- app-emulation/vmware-modules/vmware-modules-1.0.0.22.ebuild	(revision 314)
+++ app-emulation/vmware-modules/vmware-modules-1.0.0.22.ebuild	(working copy)
@@ -32,6 +32,12 @@
 	# epatch "${FILESDIR}/patches/vmblock/010_all_kernel-2.6.25.patch"
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
+	get_version
+	if kernel_is 2 6 ; then
+		if [ $KV_PATCH -ge 27 ] ; then
+			epatch "${FILESDIR}/${PV}-kernel-2.6.27.patch"
+		fi
+	fi
 	#epatch "${FILESDIR}/${PV}-vmmon-2.6.26.patch"
 	#epatch "${FILESDIR}/${PV}-vmnet-2.6.26.patch"
 	#epatch "${FILESDIR}/${PV}-vmblock-2.6.26-1.patch"