# ChangeLog for app-emulation/vmware-modules
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.81 2011/10/17 19:20:18 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.82 2011/10/19 17:17:11 vadimk Exp $
+
+ 19 Oct 2011; Vadim Kuznetsov <vadimk@gentoo.org> -files/208-sema.patch,
+ -files/208-sk_sleep.patch, -files/208-unlocked_ioctl.patch,
+ -vmware-modules-208.2.ebuild:
+ 208 vmware modules removed
17 Oct 2011; Vadim Kuznetsov <vadimk@gentoo.org>
-vmware-modules-238.4.ebuild, -vmware-modules-238.4-r1.ebuild:
AUX 1.0.0.25-sema.patch 3756 RMD160 b182d2aa998c61afc28c68e2b859fbb894ccd550 SHA1 9cb8bcee24e294ed8dbd5f27c8160186c8c6d1fe SHA256 2fe6190be73b29b29f99e8a0c74f2b34213cd394a11aef5866a957851cc37b03
AUX 1.0.0.25-sk_sleep.patch 2953 RMD160 39e0ae852ab54f84d40bdd9bfc343e3ae3742882 SHA1 875e4195420f52784605ad013dd77da59b0c3511 SHA256 0c318c8f54b55f6adaade2cdd805ccf8cb04a9ce279bce2382e7e4d1fd78d33f
AUX 1.0.0.25-unlocked_ioctl.patch 1136 RMD160 a5ae0ebd54acac07144ab1510a04ebb7cabc0598 SHA1 177c3cf965d2c83084696f8132f6c7cd6ab82a2d SHA256 0bad0f0848772ec64d40a15a48c8f9d37212dd93b243e4cc5f1172371e7fbf14
-AUX 208-sema.patch 2963 RMD160 95c017d5bb061cd548b9db6552ed548e323286c6 SHA1 8808f4796fa5c79757fbca1612c06d9fa020b5ba SHA256 ab3c79d677f5169f5c575498fb467d94f6fb1455f9a7218b34c21bddaa4704e7
-AUX 208-sk_sleep.patch 2968 RMD160 c3ef68d37bfcd877f3de0f8e9dea849e18804435 SHA1 0c52cf788c707e47fdf8ff0925c69fdca5c10155 SHA256 00ca100a8b4da48e26b663c4302a4b8f8d561c084e0bd5cee27a5874e03115f6
-AUX 208-unlocked_ioctl.patch 1136 RMD160 129bf2d0d6d4580b5c25f116d9108f4dc51e08cf SHA1 570eb32de37822c8c2b06f1075306fec3df1d257 SHA256 51f9cf2eb91fd25f784ef611ef3fd1f611bb5627a32e9e9fc5c48e3b0e9aef15
AUX 238-2.6.39.patch 8566 RMD160 1fb07e92cebba852da61b36ee10dcdb4e12d5729 SHA1 6098b91349ab7bc128fea3df27671423f5ddcd1a SHA256 31e68e9897660cc8ff898eae1d722d616205fff1efd30cd8e042a3a455bd2350
AUX 238-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
AUX sched_h-2.6.32.patch 819 RMD160 99c136ee407b892f018a9899944c73de11a6fc17 SHA1 1cd7ace0046185c069bee3f47003c7fd7a931766 SHA256 925310d18016bc5638c6a9cc8888b5b2dd5d884890386a358c6f6f527788aaa4
DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7
DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8
-DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b2907f0e2b11 SHA1 4fece02cd13f8bafdc62562d2f8e2a4cc66c75a1 SHA256 7b1d16163626b2ea2c1bba82a537368e2f758356580044480994b1fbe0073b47
EBUILD vmware-modules-1.0.0.25-r3.ebuild 2227 RMD160 eee9311501d439b63d1b657f064000c106d4e9c2 SHA1 1e3da5f429c8f04d1b3e46cb7a98171cec30d490 SHA256 3124c8b65f4245069305d5c541da8b1dd318e621f752ec8963fc285a4cae84ea
EBUILD vmware-modules-1.0.0.25-r4.ebuild 2242 RMD160 4815c0ce9280c6bb71ed8d18df9da5a5a7a2e1b9 SHA1 eccd85cb86a6cd45aa254cbada7a65557f3a72fb SHA256 f492d54e11193dfa54a0e712e3742c984c3a30f7a2a6eb68e0c82881ba55d342
-EBUILD vmware-modules-208.2.ebuild 1855 RMD160 a42bdef87a95590f779272fe8037d528d9bb6a5c SHA1 83d002b0c1432baab071dcd44a41907dfeb52c70 SHA256 e8452a07897634bbb71bae4afec2c28982223727ec9246b30882705f6ce08f43
EBUILD vmware-modules-238.5.ebuild 1991 RMD160 fde27449f5ec59546fcc83592541d23d6cfe7b10 SHA1 ff401389381805741db248a3da10125c6036efd7 SHA256 74eb7f90a96ef0cd74ce8f2bef164ddb9b20f27c00131c76e3e4da3650e7d254
-MISC ChangeLog 18195 RMD160 29f188c79cd9f25e22db6c30467b85fa5d23a31b SHA1 fedab22cd1ddb0d35f63f9cc0f5ad3a810f4d2f3 SHA256 5283efaa06758ab52042095267ba41f9c3cb9e186added2ec61a4f865d54600e
+MISC ChangeLog 18393 RMD160 d8ee40ef2542abf737e67fa505648726dce8ca43 SHA1 829ff09845928e3aec5ae6aa653c861b6f291f57 SHA256 ca9c332bb8c0670103133aa37271e1a4c5f58c12c2e947725b89db36023ea89b
MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6cf2QACgkQiLKviuHfItVAGgCfSUBnzazRXUwRg5VQxljBDHVY
-66oAoJahiCim0/P1ZQNY9wkd3W8OTatf
-=ZVy+
+iEYEARECAAYFAk6fBWAACgkQiLKviuHfItWd+ACgjRRG2vBu7eleDSOHaQEYgYpi
+/f4An0lKR2YFoT0AMipCUqCwZGBeqT1K
+=Sju5
-----END PGP SIGNATURE-----
+++ /dev/null
-diff --git a/vmci-only/include/compat_semaphore.h b/vmci-only/include/compat_semaphore.h
-index f5527b9..bc37afd 100644
---- a/vmci-only/include/compat_semaphore.h
-+++ b/vmci-only/include/compat_semaphore.h
-@@ -45,5 +45,13 @@
- #endif
- #endif
-
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+ #ifndef DECLARE_MUTEX
-+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
-+ #endif
-+ #ifndef init_MUTEX
-+ #define init_MUTEX(_m) sema_init(_m,1)
-+ #endif
-+#endif
-
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmmon-only/include/compat_semaphore.h b/vmmon-only/include/compat_semaphore.h
-index f5527b9..bc37afd 100644
---- a/vmmon-only/include/compat_semaphore.h
-+++ b/vmmon-only/include/compat_semaphore.h
-@@ -45,5 +45,13 @@
- #endif
- #endif
-
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+ #ifndef DECLARE_MUTEX
-+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
-+ #endif
-+ #ifndef init_MUTEX
-+ #define init_MUTEX(_m) sema_init(_m,1)
-+ #endif
-+#endif
-
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmnet-only/compat_semaphore.h b/vmnet-only/compat_semaphore.h
-index f5527b9..548782d 100644
---- a/vmnet-only/compat_semaphore.h
-+++ b/vmnet-only/compat_semaphore.h
-@@ -45,5 +45,14 @@
- #endif
- #endif
-
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+ #ifndef DECLARE_MUTEX
-+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
-+ #endif
-+ #ifndef init_MUTEX
-+ #define init_MUTEX(_m) sema_init(_m,1)
-+ #endif
-+#endif
-+
-
- #endif /* __COMPAT_SEMAPHORE_H__ */
-diff --git a/vmnet-only/vnetFilter.h b/vmnet-only/vnetFilter.h
-index fe5c71f..303009f 100644
---- a/vmnet-only/vnetFilter.h
-+++ b/vmnet-only/vnetFilter.h
-@@ -203,5 +203,13 @@ struct VNet_SetLogLevel {
- }
- #include "vmware_pack_end.h"
- VNet_SetLogLevel;
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+ #ifndef DECLARE_MUTEX
-+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
-+ #endif
-+ #ifndef init_MUTEX
-+ #define init_MUTEX(_m) sema_init(_m,1)
-+ #endif
-+#endif
-
- #endif // ifndef _VNETFILTER_H_
-diff --git a/vsock-only/linux/af_vsock.h b/vsock-only/linux/af_vsock.h
-index 3a8a0ce..d36b2ae 100644
---- a/vsock-only/linux/af_vsock.h
-+++ b/vsock-only/linux/af_vsock.h
-@@ -88,4 +88,14 @@ typedef struct VSockVmciSock {
- #endif
- } VSockVmciSock;
-
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+ #ifndef DECLARE_MUTEX
-+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
-+ #endif
-+ #ifndef init_MUTEX
-+ #define init_MUTEX(_m) sema_init(_m,1)
-+ #endif
-+#endif
-+
-+
- #endif /* __AF_VSOCK_H__ */
+++ /dev/null
-diff --git a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
-index 314e5fb..bd69539 100644
---- a/vsock-only/linux/af_vsock.c
-+++ b/vsock-only/linux/af_vsock.c
-@@ -3150,5 +3150,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
- */
- timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
-- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-
- while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
-@@ -3173,5 +3173,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
- }
-
-- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- }
-
-@@ -3185,5 +3185,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
-
- outWait:
-- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
- release_sock(sk);
-@@ -3392,5 +3392,5 @@ VSockVmciPoll(struct file *file, // IN
- sk = sock->sk;
-
-- poll_wait(file, sk->compat_sk_sleep, wait);
-+ poll_wait(file, compat_sk_sleep(sk), wait);
- mask = 0;
-
-@@ -3993,5 +3993,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
- */
- timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
-- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-
- while (totalWritten < len) {
-@@ -4032,5 +4032,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
- }
-
-- compat_cont_prepare_to_wait(sk->compat_sk_sleep,
-+ compat_cont_prepare_to_wait(compat_sk_sleep(sk),
- &wait, TASK_INTERRUPTIBLE);
- }
-@@ -4115,5 +4115,5 @@ outWait:
- err = totalWritten;
- }
-- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
- release_sock(sk);
-@@ -4338,5 +4338,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
- copied = 0;
-
-- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-
- while ((ready = VMCIQueue_BufReady(vsk->consumeQ,
-@@ -4381,5 +4381,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
- }
-
-- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- }
-
-@@ -4473,5 +4473,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
-
- outWait:
-- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
- release_sock(sk);
+++ /dev/null
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index bf93446..022e856 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -169,6 +169,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #endif
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 8104878..02bb71c 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -3411,7 +3411,7 @@ HostIFDoIoctl(struct file *filp,
- if (filp->f_op->unlocked_ioctl) {
- return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
- }
--#endif
-+#else
- if (filp->f_op->ioctl) {
- long err;
-
-@@ -3420,6 +3420,7 @@ HostIFDoIoctl(struct file *filp,
- unlock_kernel();
- return err;
- }
-+#endif
- return -ENOIOCTLCMD;
- }
-
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-208.2.ebuild,v 1.1 2011/03/27 15:40:08 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic linux-mod versionator
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI="mirror://gentoo/${P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- =app-emulation/vmware-server-2.0.${PV_MINOR}*"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
- VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
- VMWARE_MODULE_LIST="vmci vmmon vmnet vsock"
- VMWARE_MOD_DIR="${PN}-${PVR}"
-
- BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
- enewgroup "${VMWARE_GROUP}"
- filter-flags -mfpmath=sse
-
- for mod in ${VMWARE_MODULE_LIST}; do
- MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
- done
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- for mod in ${VMWARE_MODULE_LIST}; do
- tar -xf /opt/vmware/server/lib/modules/source/${mod}.tar
- done
-
-}
-
-src_prepare() {
- epatch "${S}/${P}.patch"
- kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV_MAJOR}-sk_sleep.patch"
- kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV_MAJOR}-unlocked_ioctl.patch"
- kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
-}
-
-src_install() {
- linux-mod_src_install
- local udevrules="${T}/60-vmware.rules"
- cat > "${udevrules}" <<-EOF
- KERNEL=="vmci", GROUP="${VMWARE_GROUP}", MODE=660
- KERNEL=="vmmon", GROUP="${VMWARE_GROUP}", MODE=660
- KERNEL=="vsock", GROUP="${VMWARE_GROUP}", MODE=660
- EOF
- insinto /etc/udev/rules.d/
- doins "${udevrules}"
-}
projects / gentoo.git / commitdiff