From: "Vadim Kuznetsov" <vadimk@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
Date: Mon, 26 Mar 2012 19:48:59 +0000 (UTC) [thread overview]
Message-ID: <1332791274.b8cd1aeece72954fe1753b2bb078755b84ab40e3.vadimk@gentoo> (raw)
commit: b8cd1aeece72954fe1753b2bb078755b84ab40e3
Author: Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 19:47:54 2012 +0000
Commit: Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:47:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b8cd1aee
added apic patch. bug 404089.
modified: Manifest
new file: files/264-apic.patch
deleted: files/apic.patch
modified: vmware-modules-264.2-r1.ebuild
---
app-emulation/vmware-modules/Manifest | 26 --------------------
app-emulation/vmware-modules/files/264-apic.patch | 12 +++++++++
app-emulation/vmware-modules/files/apic.patch | 12 ---------
.../vmware-modules/vmware-modules-264.2-r1.ebuild | 1 +
4 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index ba62c16..349c432 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,28 +1,2 @@
-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-3.2.0.patch 3533 RMD160 e7928a853397dd5f01b46022e2abdd24c440c4b1 SHA1 bb91934f89cabb305ad9df6d6f5df3fa4f32f900 SHA256 df2bf5a026281559ba6e0d364555c8f48024b7ce2231c652960b5c477cc4545a
-AUX 238-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
-AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
-AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
-AUX 238-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751
-AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0
-AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458
-AUX 264-3.2.0.patch 3527 RMD160 1bb5eaebbf8cc17bd9dd4f2cd87554e52bb1f714 SHA1 0d80f90ef11fc07064963c4ec90a136a8b40189a SHA256 5c4e679b9667a353c4b19ad17ec086386314a56c1890e87a44fc6da16c655029
-AUX 264-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
-AUX 264-makefile-include.patch 2501 RMD160 da46f1229097539c7272d421f4d50b322e4d6e28 SHA1 30b57e8033e49eaf4923a4032765950e684533fc SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169
-AUX 264-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
-AUX 264-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751
-AUX 264.2-3.2.0.patch 2949 RMD160 e343db72eeb80e43ab5fbd5b4c2efebcb81c2c5e SHA1 bf88b0be9fcdc9705de846452d44833e0b146c11 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0
-AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c
-AUX hardened.patch 5052 RMD160 818caeb51a5fa7aae556e465beadc0ff684b54a7 SHA1 8a5feac39756fd476c087af247e853b0321a4823 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6
-AUX iommu_map.patch 1630 RMD160 b403a19350d3a73e6ecf74159763b31d6d20b630 SHA1 d021dbbdb59273048806c09b8f59bd97a8883017 SHA256 6253ba1c6bd211d68e79ce9e811cdcc60ebc022a7787874922db552b32ef2b09
-AUX sk_sleep.patch 6937 RMD160 e15642e34906138278563d57e9647e4e579d437e SHA1 ce9a3e9069bb85cb9793c59d38ad4f217ba8d5b2 SHA256 67a019290204b36410996ecd1bbe4e630b2022970ddb236a120abf1b810f05b4
DIST vmware-modules-138.10-genpatches-7.tar.bz2 14498 RMD160 a6927bad3eb2b797eb5d8d2a90c6447ebb1fd709 SHA1 57a1524149f976bccfbc0789cd40863f1ab012f0 SHA256 2b3209e71543904eb39919b3da19df4b1c702b00e5f2def9c9d53b3ca9b7e2b6
DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b2907f0e2b11 SHA1 4fece02cd13f8bafdc62562d2f8e2a4cc66c75a1 SHA256 7b1d16163626b2ea2c1bba82a537368e2f758356580044480994b1fbe0073b47
-EBUILD vmware-modules-138.10.7.ebuild 1825 RMD160 3e4999c91f97217815c9d8ad852a63f0d452995d SHA1 c2bd1e62e0418f62b5f62261811734ba9e8f34b2 SHA256 573f1080031bf394cde783ef5d574da7934546d586e3dc942037fde0b1d2e6be
-EBUILD vmware-modules-208.2.ebuild 1861 RMD160 6641f57a7906ff1eb243e14561c37475eda6d910 SHA1 aab9187681ca6b88b4178b98d259116130c39037 SHA256 140d78cc98da4cd19a24d593bec01417793592212273d632adfc465fe80ff311
-EBUILD vmware-modules-238.5.ebuild 2087 RMD160 4ce59dbfcd91b1c7fb7890db44598b712bd4a167 SHA1 81b125573edfa561de02b9f8c4dd4dd96a44002b SHA256 25544d4c0c21e3ccd72f6730a9336487e5020c743bfa400c01d5c0623a504f2f
-EBUILD vmware-modules-264.2.ebuild 2002 RMD160 f22df59a56b628866e97c25aa0cb86f4bbba66f4 SHA1 9b58cb8c562c762b44f5bb2b2dce58234f173d38 SHA256 3b29b808d758ea9e452104695652b8a2526dd1f3aecbf005d247b617cb768c50
-MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/files/264-apic.patch b/app-emulation/vmware-modules/files/264-apic.patch
new file mode 100644
index 0000000..66cd459
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
+
++#include <asm/apic.h>
+
+ #include "vmware.h"
+ #include "x86apic.h"
diff --git a/app-emulation/vmware-modules/files/apic.patch b/app-emulation/vmware-modules/files/apic.patch
deleted file mode 100644
index 107da28..0000000
--- a/app-emulation/vmware-modules/files/apic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200
-+++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200
-@@ -78,6 +78,8 @@
- #include "vmmonInt.h"
- #include "versioned_atomic.h"
-
-+#include <asm/apic.h>
-+
- #define UPTIME_FREQ CONST64(1000000)
-
- static struct {
-
diff --git a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
index ceff913..33cd7d5 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
epatch "${FILESDIR}/${PV}-3.2.0.patch"
use hardened && epatch "${FILESDIR}/hardened.patch"
+ epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
}
src_install() {
next reply other threads:[~2012-03-26 19:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-26 19:48 Vadim Kuznetsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 13:29 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/ Vadim Kuznetsov
2012-05-24 17:32 Vadim Kuznetsov
2012-11-17 11:58 Vadim Kuznetsov
2012-12-16 13:27 Vadim Kuznetsov
2013-06-23 13:14 Andreas Hüttel
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-11 15:52 Evan Teran
2015-05-05 16:59 Evan Teran
2015-05-07 1:55 Evan Teran
2015-07-11 4:21 Evan Teran
2015-09-19 19:08 Andreas Hüttel
2016-03-17 2:26 Evan Teran
2016-05-19 18:18 Fabio Rossi
2016-08-17 12:38 Fabio Rossi
2016-12-12 21:19 Evan Teran
2017-04-05 14:49 Evan Teran
2017-05-23 23:26 Fabio Rossi
2017-05-23 23:26 Fabio Rossi
2017-08-21 17:07 Evan Teran
2018-04-07 15:00 Fabio Rossi
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=1332791274.b8cd1aeece72954fe1753b2bb078755b84ab40e3.vadimk@gentoo \
--to=vadimk@gentoo.org \
--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