diff options
| -rw-r--r-- | app-emulation/vmware-modules/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/vmware-modules/files/264-3.2.0.patch | 93 | ||||
| -rw-r--r-- | app-emulation/vmware-modules/vmware-modules-264.1.ebuild | 1 |
3 files changed, 96 insertions, 1 deletions
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 7eeb0bb..e44a720 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -7,6 +7,7 @@ AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d4 AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 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 3100 RMD160 7ca6bf61249fd0f4fde34b621c605e9be0fe3789 SHA1 b4ecbf4d890ea55e17047102af52632db0a420bd SHA256 40ac22fc4a1cf859186e26155ff96ab2bbd26ea58be2f6bce5c2b12e0949c4bd 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 @@ -19,5 +20,5 @@ DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b290 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 1873 RMD160 681c4ccebeb95f2fed04a4c96e61ac2eeb78b7c2 SHA1 cb0182be00360b491b1a786a19e22109433801de SHA256 387ff9118264bb7b4da60676320d1cf464bc45b6c2312ee5b41174ddcf74015a -EBUILD vmware-modules-264.1.ebuild 1783 RMD160 8675556e0a64b43598daa0e5bb3112decdbcfe93 SHA1 a24a74b639692c718d73cbdf4d20b9a74388492b SHA256 52595ee7801735540b5fd7e3bb3b43fbc7bbcb114efbc6ee67b312675e9926d8 +EBUILD vmware-modules-264.1.ebuild 1829 RMD160 0c13052213d7d078fde686aea8a873a23c3a167f SHA1 3965690ea5ffcd4818cfe0c6374d831df4ddd65a SHA256 ac0764230499f08db9bb0e32ccdb03aeae0d25e5205478c3820ec290601765cf MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch new file mode 100644 index 0000000..60a0be2 --- /dev/null +++ b/app-emulation/vmware-modules/files/264-3.2.0.patch @@ -0,0 +1,93 @@ +diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c +index c692c2d..e8b6099 100644 +--- a/vmmon-only/linux/iommu.c ++++ b/vmmon-only/linux/iommu.c +@@ -42,6 +42,12 @@ + #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf)) + #define PCI_BDF_BUS(bdf) (((bdf) >> 8) & 0xff) + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#include <linux/pci.h> ++#define iommu_found() iommu_present(&pci_bus_type) ++#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type) ++#endif ++ + typedef struct PassthruDevice { + uint32 bdf; + struct pci_dev *pdev; +diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c +index 491add5..74f7a3b 100644 +--- a/vmnet-only/filter.c ++++ b/vmnet-only/filter.c +@@ -40,6 +40,10 @@ + #include "vnetInt.h" + #include "vmnetInt.h" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#include <linux/export.h> ++#endif ++ + // VNet_FilterLogPacket.action for dropped packets + #define VNET_FILTER_ACTION_DRP (1) + #define VNET_FILTER_ACTION_DRP_SHORT (2) +diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c +index 4bdb643..540301c 100644 +--- a/vmnet-only/netif.c ++++ b/vmnet-only/netif.c +@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev); + static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); + static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); + static int VNetNetifSetMAC(struct net_device *dev, void *addr); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + static void VNetNetifSetMulticast(struct net_device *dev); ++#endif + #if 0 + static void VNetNetifTxTimeout(struct net_device *dev); + #endif +@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev) // IN: + .ndo_stop = VNetNetifClose, + .ndo_get_stats = VNetNetifGetStats, + .ndo_set_mac_address = VNetNetifSetMAC, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = VNetNetifSetMulticast, ++#endif + /* + * We cannot stuck... If someone will report problems under + * low memory conditions or some such, we should enable it. +@@ -612,11 +616,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: + *---------------------------------------------------------------------- + */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) + void + VNetNetifSetMulticast(struct net_device *dev) // IN: unused + { + } +- ++#endif + + /* + *---------------------------------------------------------------------- +diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c +index 541187b..77e0089 100644 +--- a/vmnet-only/userif.c ++++ b/vmnet-only/userif.c +@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb, // IN: skb to copy + unsigned int tmpCsum; + const void *vaddr; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++ vaddr = kmap(skb_frag_page(frag)); ++#else + vaddr = kmap(frag->page); ++#endif + tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset, + curr, frag->size, 0, &err); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++ kunmap(skb_frag_page(frag)); ++#else + kunmap(frag->page); ++#endif + if (err) { + return err; + } diff --git a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild index 7dcf0e1..d62ea1d 100644 --- a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild @@ -63,6 +63,7 @@ src_prepare() { epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch" epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" + epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch" } src_install() { |