From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-870482-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7EAB259CA3
for <garchives@archives.gentoo.org>; Thu, 17 Mar 2016 02:03:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 795EAE0848;
Thu, 17 Mar 2016 02:03:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 054F9E0848
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Mar 2016 02:03:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 66966340CD8
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Mar 2016 02:03:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E53384D
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Mar 2016 02:03:14 +0000 (UTC)
From: "Evan Teran" <evan.teran@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Evan Teran" <evan.teran@gmail.com>
Message-ID: <1458180185.1f0fe410a387b4dfeb5b8633576023135ca9ddc4.eteran@gentoo>
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
X-VCS-Repository: proj/vmware
X-VCS-Files: app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild app-emulation/vmware-modules/vmware-modules-304.3.ebuild
X-VCS-Directories: app-emulation/vmware-modules/files/ app-emulation/vmware-modules/
X-VCS-Committer: eteran
X-VCS-Committer-Name: Evan Teran
X-VCS-Revision: 1f0fe410a387b4dfeb5b8633576023135ca9ddc4
X-VCS-Branch: master
Date: Thu, 17 Mar 2016 02:03:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e6f152dc-45de-4f52-a537-d0c9f2432124
X-Archives-Hash: 1a9bd838eb5158d50e55618cd9b017de
commit: 1f0fe410a387b4dfeb5b8633576023135ca9ddc4
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu Mar 17 02:03:05 2016 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Mar 17 02:03:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1f0fe410
app-emulation/vmware-modules:
compiles on 4.3 kernels :-)
Package-Manager: portage-2.2.26
.../files/304-4.3-00-misc_deregister.patch | 34 ++++++++++++++++++++++
...304.3.ebuild => vmware-modules-304.3-r1.ebuild} | 1 +
2 files changed, 35 insertions(+)
diff --git a/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
new file mode 100644
index 0000000..32d960d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
@@ -0,0 +1,34 @@
+diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
+--- vmci-only/linux/driver.c 2016-03-16 21:59:30.229062702 -0400
++++ vmci-only.new/linux/driver.c 2016-03-16 21:58:35.452061974 -0400
+@@ -2469,7 +2469,9 @@ vmci_init(void)
+ static void __exit
+ vmci_exit(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+ int retval;
++#endif
+
+ if (guestDeviceInit) {
+ pci_unregister_driver(&vmci_driver);
+
+diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
+--- vmci-only/linux/driver.c 2016-03-16 21:53:24.184057841 -0400
++++ vmci-only.new/linux/driver.c 2016-03-16 21:54:37.558058816 -0400
+@@ -2482,12 +2482,16 @@ vmci_exit(void)
+
+ VMCI_HostCleanup();
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++ misc_deregister(&linuxState.misc);
++#else
+ retval = misc_deregister(&linuxState.misc);
+ if (retval) {
+ Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
+ } else {
+ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+ }
++#endif
+
+ hostDeviceInit = FALSE;
+ }
diff --git a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
similarity index 97%
rename from app-emulation/vmware-modules/vmware-modules-304.3.ebuild
rename to app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index a77203d..766eb32 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -99,6 +99,7 @@ src_prepare() {
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
+ kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
# Allow user patches so they can support RC kernels and whatever else
epatch_user