diff options
11 files changed, 109 insertions, 536 deletions
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest deleted file mode 100644 index 50c1c4c..0000000 --- a/app-emulation/open-vm-tools-kmod/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb -DIST open-vm-tools-2012.12.26-958366.tar.gz 3622541 SHA256 8d63a9c1e36ef968b87125b3c55c8ed5f75ecc9eafe84716eddee687b5b81606 SHA512 748d44951dcdff570faab071a5681ce68f8647df002de3a79853fbf1571835499f2dabc863cc7782b23fd55ad568d479ab10db9ff0bfc7c27cab4999b61f2a89 WHIRLPOOL ce4a51e9a40afea2a2f410e05ff9ca3535611a53d99c05e4d079f9b6df2cef1373113e3ec82bec378441f5f6689f6211c570c0ed4cfffe84534943d875f1bacb -DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f -DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56 -DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872 diff --git a/app-emulation/open-vm-tools-kmod/files/fragsize.patch b/app-emulation/open-vm-tools-kmod/files/fragsize.patch deleted file mode 100644 index 1f85df5..0000000 --- a/app-emulation/open-vm-tools-kmod/files/fragsize.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/modules/linux/vmxnet/vmxnet.c b/modules/linux/vmxnet/vmxnet.c -index a6f5740..3c75bb2 100644 ---- a/modules/linux/vmxnet/vmxnet.c -+++ b/modules/linux/vmxnet/vmxnet.c -@@ -989,7 +989,7 @@ vmxnet_probe_device(struct pci_dev *pdev, // IN: vmxnet PCI device - .ndo_start_xmit = &vmxnet_start_tx, - .ndo_stop = &vmxnet_close, - .ndo_get_stats = &vmxnet_get_stats, -- .ndo_set_multicast_list = &vmxnet_set_multicast_list, -+ .ndo_set_rx_mode = &vmxnet_set_multicast_list, - .ndo_change_mtu = &vmxnet_change_mtu, - # ifdef VMW_HAVE_POLL_CONTROLLER - .ndo_poll_controller = vmxnet_netpoll, -@@ -2033,21 +2033,23 @@ vmxnet_map_pkt(struct sk_buff *skb, - offset -= skb_headlen(skb); - - for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++){ -+ int fragSize; - frag = &skb_shinfo(skb)->frags[nextFrag]; -+ fragSize = skb_frag_size(frag); - - // skip those frags that are completely copied -- if (offset >= frag->size){ -- offset -= frag->size; -+ if (offset >= fragSize){ -+ offset -= fragSize; - } else { - // map the part of the frag that is not copied - dma = pci_map_page(lp->pdev, -- frag->page, -+ frag->page.p, - frag->page_offset + offset, -- frag->size - offset, -+ fragSize - offset, - PCI_DMA_TODEVICE); -- VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size - offset); -+ VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize - offset); - VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d]+%u (%uB)\n", -- dd->txDriverNext, nextSg, nextFrag, offset, frag->size - offset); -+ dd->txDriverNext, nextSg, nextFrag, offset, fragSize - offset); - nextSg++; - nextFrag++; - -@@ -2058,11 +2060,14 @@ vmxnet_map_pkt(struct sk_buff *skb, - - // map the remaining frags, we might need to use additional tx entries - for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++) { -+ int fragSize; - frag = &skb_shinfo(skb)->frags[nextFrag]; -+ fragSize = skb_frag_size(frag); -+ - dma = pci_map_page(lp->pdev, -- frag->page, -+ frag->page.p, - frag->page_offset, -- frag->size, -+ fragSize, - PCI_DMA_TODEVICE); - - if (nextSg == VMXNET2_SG_DEFAULT_LENGTH) { -@@ -2091,9 +2096,9 @@ vmxnet_map_pkt(struct sk_buff *skb, - - nextSg = 0; - } -- VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size); -+ VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize); - VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d] (%uB)\n", -- dd->txDriverNext, nextSg, nextFrag, frag->size); -+ dd->txDriverNext, nextSg, nextFrag, fragSize); - nextSg++; - } - -@@ -2548,7 +2553,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb) - if (UNLIKELY(newPage == NULL)) { - skb_shinfo(skb)->nr_frags = numFrags; - skb->len += skb->data_len; -- skb->truesize += skb->data_len; -+ skb->truesize += PAGE_SIZE; - - compat_dev_kfree_skb(skb, FREE_WRITE); - -@@ -2558,10 +2563,12 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb) - } - - pci_unmap_page(pdev, rre2->paddr, PAGE_SIZE, PCI_DMA_FROMDEVICE); -- skb_shinfo(skb)->frags[numFrags].page = lp->rxPages[dd->rxDriverNext2]; -+ __skb_frag_set_page(&skb_shinfo(skb)->frags[numFrags], -+ lp->rxPages[dd->rxDriverNext2]); - skb_shinfo(skb)->frags[numFrags].page_offset = 0; - skb_shinfo(skb)->frags[numFrags].size = rre2->actualLength; - skb->data_len += rre2->actualLength; -+ skb->truesize += PAGE_SIZE; - numFrags++; - - /* refill the buffer */ -@@ -2579,7 +2586,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb) - VMXNET_ASSERT(numFrags > 0); - skb_shinfo(skb)->nr_frags = numFrags; - skb->len += skb->data_len; -- skb->truesize += skb->data_len; -+ skb->truesize += PAGE_SIZE; - VMXNET_LOG("vmxnet_rx: %dB from rxRing[%d](%dB)+rxRing2[%d, %d)(%dB)\n", - skb->len, dd->rxDriverNext, skb_headlen(skb), - firstFrag, dd->rxDriverNext2, skb->data_len); diff --git a/app-emulation/open-vm-tools-kmod/files/frozen.patch b/app-emulation/open-vm-tools-kmod/files/frozen.patch deleted file mode 100644 index 8b3fd7f..0000000 --- a/app-emulation/open-vm-tools-kmod/files/frozen.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c ---- a/modules/linux/vmsync/sync.c 2012-08-01 19:02:59.000000000 -0700 -+++ b/modules/linux/vmsync/sync.c 2012-10-14 07:38:18.000000000 -0700 -@@ -162,7 +162,11 @@ VmSyncThawDevices(void *_state) // IN - cancel_delayed_work(&state->thawTask); - list_for_each_safe(cur, tmp, &state->devices) { - dev = list_entry(cur, VmSyncBlockDevice, list); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -+ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) { -+#else - if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) { -+#endif - thaw_bdev(dev->bdev, dev->sb); - atomic_dec(&gFreezeCount); - } -@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state, - * the superblock is already frozen. - */ - if (inode->i_sb->s_bdev == NULL || -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -+ inode->i_sb->s_writers.frozen != SB_UNFROZEN) { -+#else - inode->i_sb->s_frozen != SB_UNFROZEN) { -+#endif - result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY; - compat_path_release(&nd); - goto exit; - diff --git a/app-emulation/open-vm-tools-kmod/files/putname.patch b/app-emulation/open-vm-tools-kmod/files/putname.patch deleted file mode 100644 index b605e12..0000000 --- a/app-emulation/open-vm-tools-kmod/files/putname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/linux/vmblock/linux/control.c b/modules/linux/vmblock/linux/control.c -index 79716bd..2dd83fe 100644 ---- a/modules/linux/vmblock/linux/control.c -+++ b/modules/linux/vmblock/linux/control.c -@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name - - retval = i < 0 ? -EINVAL : blockOp(name, blocker); - -- putname(name); -+ __putname(name); - - return retval; - } diff --git a/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch new file mode 100644 index 0000000..3918162 --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch @@ -0,0 +1,42 @@ +Source: https://github.com/rasa/vmware-tools-patches/ + +--- a/modules/linux/vmhgfs/inode.c ++++ b/modules/linux/vmhgfs/inode.c +@@ -31,6 +31,9 @@ + #include <linux/namei.h> + #endif + #include <linux/highmem.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) ++#include <linux/dcache.h> ++#endif + + #include "compat_cred.h" + #include "compat_fs.h" +@@ -1890,7 +1893,11 @@ + #endif + &inode->i_dentry, + d_alias) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) ++ int dcount = d_count(dentry); ++#else + int dcount = dentry->d_count; ++#endif + if (dcount) { + LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount)); + return HgfsAccessInt(dentry, mask & (MAY_READ | MAY_WRITE | MAY_EXEC)); +@@ -1943,10 +1950,12 @@ + list_for_each(pos, &inode->i_dentry) { + int dcount; + struct dentry *dentry = list_entry(pos, struct dentry, d_alias); +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) +- dcount = atomic_read(&dentry->d_count); +-#else ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) ++ dcount = d_count(dentry); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + dcount = dentry->d_count; ++#else ++ dcount = atomic_read(&dentry->d_count); + #endif + if (dcount) { + LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount)); diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild deleted file mode 100644 index d64fc7a..0000000 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.05.21.724730.ebuild,v 1.1 2012/06/02 14:45:23 vadimk Exp $ - -EAPI="4" - -inherit eutils linux-info linux-mod versionator - -MY_PN="${PN/-kmod}" -MY_PV="$(replace_version_separator 3 '-')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/linux-sources - " - -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 - " - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_MOD_DIR="modules/linux" - VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" - - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [ "${mod}" == "vmxnet" ]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done -} - -src_prepare() { - sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ - || die "Sed failed." - epatch "${FILESDIR}/frozen.patch" -} - -src_configure() { - : # do nothing at all -} - -src_install() { - linux-mod_src_install - - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vsock", GROUP="vmware", MODE=660 - EOF - insinto /lib/udev/rules.d/ - doins "${udevrules}" -} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild deleted file mode 100644 index cfb09ce..0000000 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-info linux-mod versionator - -MY_PN="${PN/-kmod}" -MY_PV="$(replace_version_separator 3 '-')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/linux-sources - " - -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 - " - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_MOD_DIR="modules/linux" - VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" - - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [ "${mod}" == "vmxnet" ]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done -} - -src_prepare() { - sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ - || die "Sed failed." - epatch "${FILESDIR}/frozen.patch" -} - -src_configure() { - : # do nothing at all -} - -src_install() { - linux-mod_src_install - - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vsock", GROUP="vmware", MODE=660 - EOF - insinto /lib/udev/rules.d/ - doins "${udevrules}" -} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild deleted file mode 100644 index 2ef82e2..0000000 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild,v 1.2 2013/03/15 19:48:53 floppym Exp $ - -EAPI="4" - -inherit eutils linux-info linux-mod versionator - -MY_PN="${PN/-kmod}" -MY_PV="$(replace_version_separator 3 '-')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/linux-sources - " - -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 - " - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_MOD_DIR="modules/linux" - VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" - - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [ "${mod}" == "vmxnet" ]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done -} - -src_prepare() { - sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ - || die "Sed failed." - epatch "${FILESDIR}/frozen.patch" - epatch "${FILESDIR}/putname.patch" - epatch_user -} - -src_configure() { - : # do nothing at all -} - -src_install() { - linux-mod_src_install - - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vsock", GROUP="vmware", MODE=660 - EOF - insinto /lib/udev/rules.d/ - doins "${udevrules}" -} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild new file mode 100644 index 0000000..8ab6ce4 --- /dev/null +++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.6 2014/08/10 16:18:12 floppym Exp $ + +EAPI="5" + +inherit eutils linux-mod versionator udev + +MY_PN="${PN/-kmod}" +MY_PV="$(replace_version_separator 3 '-')" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="http://open-vm-tools.sourceforge.net/" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="vmhgfs" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3 + !UIDGID_STRICT_TYPE_CHECKS" + + # See logic in configure.ac. + local MODULES="vmxnet" + + use vmhgfs && MODULES+=" vmhgfs" + + if kernel_is -lt 3 9; then + MODULES+=" vmci vsock" + else + CONFIG_CHECK+=" VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" + fi + + if kernel_is -lt 3; then + MODULES+=" vmblock vmsync" + else + CONFIG_CHECK+=" ~FUSE_FS" + fi + + local mod + for mod in ${MODULES}; do + MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})" + done + + linux-mod_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/vmhgfs-linux-3.11.patch" + epatch_user +} + +src_configure() { + BUILD_TARGETS="auto-build" + export OVT_SOURCE_DIR="${S}" + export LINUXINCLUDE="${KV_OUT_DIR}/include" +} + +src_install() { + linux-mod_src_install + udev_dorules "${FILESDIR}/60-vmware.rules" +} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild deleted file mode 100644 index 0aad33e..0000000 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild,v 1.2 2012/05/31 23:14:43 zmedico Exp $ - -EAPI="4" - -inherit eutils linux-info linux-mod versionator - -MY_PN="${PN/-kmod}" -MY_PV="$(replace_version_separator 3 '-')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/linux-sources - " -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 - " - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_MOD_DIR="modules/linux" - VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" - - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [ "${mod}" == "vmxnet" ]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done -} - -src_prepare() { - sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ - || die "Sed failed." - kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch" -} - -src_configure() { - : # do nothing at all -} - -src_install() { - linux-mod_src_install - - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vsock", GROUP="vmware", MODE=660 - EOF - insinto /lib/udev/rules.d/ - doins "${udevrules}" -} diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild deleted file mode 100644 index e528d56..0000000 --- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild,v 1.2 2012/05/31 23:14:43 zmedico Exp $ - -EAPI="4" - -inherit eutils linux-info linux-mod versionator - -MY_PN="${PN/-kmod}" -MY_PV="$(replace_version_separator 3 '-')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/linux-sources - " -CONFIG_CHECK=" - ~DRM_VMWGFX - ~VMWARE_BALLOON - ~VMWARE_PVSCSI - ~VMXNET3 - " - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - VMWARE_MOD_DIR="modules/linux" - VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock" - - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [ "${mod}" == "vmxnet" ]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done -} - -src_prepare() { - sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\ - || die "Sed failed." - #kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch" - epatch "${FILESDIR}/frozen.patch" -} - -src_configure() { - : # do nothing at all -} - -src_install() { - linux-mod_src_install - - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vsock", GROUP="vmware", MODE=660 - EOF - insinto /lib/udev/rules.d/ - doins "${udevrules}" -} |