public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Evan Teran" <evan.teran@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
Date: Sat, 11 Oct 2014 15:52:47 +0000 (UTC)	[thread overview]
Message-ID: <1413042421.87ec4f2abfca54db62bfa89450aa1c55a2e5d9b5.eteran@gentoo> (raw)

commit:     87ec4f2abfca54db62bfa89450aa1c55a2e5d9b5
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Sat Oct 11 15:47:01 2014 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Sat Oct 11 15:47:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=87ec4f2a

build on 3.14.0

---
 .../files/279-3.10-03-deprecated.patch             | 85 ++++++++++++++++++++++
 ...10-03-dentry.patch => 279-3.10-04-dentry.patch} |  0
 ...3.10-04-inode.patch => 279-3.10-05-inode.patch} |  0
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |  5 +-
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
new file mode 100644
index 0000000..3a9f785
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -0,0 +1,85 @@
+diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
+--- vmblock-only/shared/vm_assert.h	2014-10-09 21:50:54.221159088 -0400
++++ vmblock-only.new/shared/vm_assert.h	2014-10-09 21:53:04.612166156 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
+--- vmci-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmci-only.new/shared/vm_assert.h	2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
+--- vmmon-only/include/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmmon-only.new/include/vm_assert.h	2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
+--- vmnet-only/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmnet-only.new/vm_assert.h	2014-10-09 21:52:57.736165784 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
+--- vsock-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vsock-only.new/shared/vm_assert.h	2014-10-09 21:52:45.352165112 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
similarity index 100%
rename from app-emulation/vmware-modules/files/279-3.10-03-dentry.patch
rename to app-emulation/vmware-modules/files/279-3.10-04-dentry.patch

diff --git a/app-emulation/vmware-modules/files/279-3.10-04-inode.patch b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
similarity index 100%
rename from app-emulation/vmware-modules/files/279-3.10-04-inode.patch
rename to app-emulation/vmware-modules/files/279-3.10-05-inode.patch

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index cd4419a..131d93a 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -83,8 +83,9 @@ src_prepare() {
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-unused-typedef.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-dentry.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-inode.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch"
 
 	# fixes a memcpy/memcmp bug in the hub code
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch"


             reply	other threads:[~2014-10-11 15:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-11 15:52 Evan Teran [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-12-05  0:16 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/ Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-08-22 10:02 Fabio Rossi
2016-08-05  7:29 Fabio Rossi
2016-05-30 21:52 Fabio Rossi
2016-03-18 23:33 Andreas Hüttel
2016-03-18  3:16 Evan Teran
2016-03-17  2:03 Evan Teran
2016-03-17  1:44 Evan Teran
2015-07-10 23:42 Evan Teran
2015-07-10 23:17 Evan Teran
2014-10-11 21:54 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1413042421.87ec4f2abfca54db62bfa89450aa1c55a2e5d9b5.eteran@gentoo \
    --to=evan.teran@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox