diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-11-05 16:27:30 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-11-05 16:27:30 +0000 |
| commit | 8bb13ceef59e3de32630bb731d702fdb4a1d23e9 (patch) | |
| tree | 1cc7017750b37aa36b53fb0b05256f5cca6c02d1 /app-emulation | |
| parent | Fix division by zero by Robert Trace (bug #323105). (diff) | |
| download | historical-8bb13ceef59e3de32630bb731d702fdb4a1d23e9.tar.gz historical-8bb13ceef59e3de32630bb731d702fdb4a1d23e9.tar.bz2 historical-8bb13ceef59e3de32630bb731d702fdb4a1d23e9.zip | |
add 2.6.36 Linux kernel support
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
5 files changed, 28 insertions, 9 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index afe7cb2c7cba..de886ac4bf4c 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.58 2010/08/04 19:01:30 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.59 2010/11/05 16:27:29 lxnay Exp $ + + 05 Nov 2010; Fabio Erculiani <lxnay@gentoo.org> + vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild, + +files/1.0.0.26-ioctl-2.6.36.patch: + add 2.6.36 Linux kernel support 04 Aug 2010; Vadim Kuznetsov <vadimk@gentoo.org> +files/1.0.0.24-sk_sleep.patch, vmware-modules-1.0.0.24-r1.ebuild, diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 9b54bc34c884..793474b17195 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -8,6 +8,7 @@ AUX 1.0.0.25-autoconf-generated.patch 17674 RMD160 38343d24d8cdfd7e312f3e60cf87f AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f AUX 1.0.0.25-sk_sleep.patch 2953 RMD160 39e0ae852ab54f84d40bdd9bfc343e3ae3742882 SHA1 875e4195420f52784605ad013dd77da59b0c3511 SHA256 0c318c8f54b55f6adaade2cdd805ccf8cb04a9ce279bce2382e7e4d1fd78d33f +AUX 1.0.0.26-ioctl-2.6.36.patch 426 RMD160 1903c7c024cd6b138af535edf2220adfb39f2fb0 SHA1 d6d0a717c9d804e849b576376db47b43b5206177 SHA256 fbe3f3332a237dd218a8a280f9aca1b0be5d80d671cf20b7fb395a540280feeb AUX 1.0.0.26-iommu_map.patch 908 RMD160 80eaf9032f1a7b6793e1921880240b76456f92a7 SHA1 11c10e8ca7bd74eb2f430522373bf8c5827151b1 SHA256 641c1db195f65a46dccbd4757d34dca6f7ea558b625a3953f980dc5601208586 AUX 1.0.0.26-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c AUX 1.0.0.26-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 @@ -33,7 +34,7 @@ DIST vmware-modules-1.0.0.26.x86.tar.bz2 630393 RMD160 f43fd73be421cac84a1b04f1b EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d EBUILD vmware-modules-1.0.0.24-r1.ebuild 2059 RMD160 b7e8ec8509cec3df79a1e1c60e9f7ce6a7063402 SHA1 b14b5b4c02c93990e0ce94105a236bbc7559c474 SHA256 7afef8c3b65c858fca15174f81432537e8a04dd1bb0ff0bfcfdf61de4dbfd0f6 -EBUILD vmware-modules-1.0.0.25-r1.ebuild 2048 RMD160 c5d094bba3250b2bc28b16949a56786693b78cc5 SHA1 a27c23818e24f4cfd52078afbb5f8e60bf3dcac3 SHA256 3dee5dbe66aefb5375d82bb3a4e5b8be85d8c5678a7bca70975b2f1f70ceb4a4 -EBUILD vmware-modules-1.0.0.26.ebuild 1955 RMD160 513db378198a3d6f8373d4d8a89c2f79a2bdca10 SHA1 eade0338156b104e0511cc7d21585e7771bcb896 SHA256 f158d8dcf6f066ec4571f7e74d96189ae7fad3092fbfeb681be01aad0657036e -MISC ChangeLog 13347 RMD160 cf61c86f31d4342eae19b82ec515b769dac62849 SHA1 89ba7d4e89e0196bd6bace37c1e75dbbd4d814e2 SHA256 cba81bbd902d25af8bd9db79808ac1e67d60a6438a97af1763037c53d92e19a2 +EBUILD vmware-modules-1.0.0.25-r1.ebuild 2050 RMD160 b1d2772dedb71ec8351e1c58b131f671bfc02b4c SHA1 cd4995359b2192465eb6b6f4cfdef19d0f911683 SHA256 c323e7b3081a65d9f67d351d5f1976c2204160e164b4d5039bfb3002263ffe61 +EBUILD vmware-modules-1.0.0.26.ebuild 2030 RMD160 92955b962d69c16dee545380ccdfc040e38fb590 SHA1 65f2eb6c7de4c9ee55a670860d83801bff902e3c SHA256 d17e53da4eb090a463841ca411674e7695b15bf66b1c80152de18bb042137823 +MISC ChangeLog 13538 RMD160 55fa78f761fe2cc2c80a3d7452c7d3ac9f69166d SHA1 ac4bcd9eb755fa137c16354871abf198457e2ef6 SHA256 989e46ec19d8f6d952e00f3670edb139b2dc42f51d06c6fde56e433818d905fe MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 diff --git a/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch b/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch new file mode 100644 index 000000000000..1b9cf18e5c3a --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch @@ -0,0 +1,12 @@ +--- a/vmmon-only/linux/driver.c ++++ b/vmmon-only/linux/driver.c +@@ -143,6 +143,9 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) + #define VMW_NOPAGE_2624 + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) ++#define VMW_HAVE_UNLOCKED_IOCTL ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \ + (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)) + # define kernel_locked_by_current() kernel_locked() diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild index 5e8e0a994d8f..0100dce8868c 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.4 2010/08/04 19:01:30 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.5 2010/11/05 16:27:29 lxnay Exp $ EAPI="2" @@ -62,7 +62,7 @@ src_prepare() { epatch "${FILESDIR}/${PV}-autoconf-generated.patch" epatch "${FILESDIR}/apic.patch" #kernel_is 2 6 35 && epatch "${FILESDIR}/iommu_map.patch" - kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch" + kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch" } diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild index 0435c38030f3..abbaa5d9e287 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.3 2010/08/04 19:01:30 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.4 2010/11/05 16:27:29 lxnay Exp $ EAPI="2" @@ -59,8 +59,9 @@ src_prepare() { epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" epatch "${FILESDIR}/${PV}-makefile-include.patch" epatch "${FILESDIR}/apic.patch" - kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-iommu_map.patch" - kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch" + kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-iommu_map.patch" + kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch" + kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-ioctl-2.6.36.patch" } src_install() { |