Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-08 12:30:44 +02:00
Code Issues Projects Releases Wiki Activity

remove open-vm-tools-\* in favor of gentoo's versions

Browse source
This commit is contained in:
Rick Farina (Zero_Chaos) 2015-10-19 13:37:55 -04:00
parent 03ad60a9c1
commit 35def3c016
11 changed files with 0 additions and 466 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app-emulation/open-vm-tools-kmod/Manifest
View file

@ -1 +0,0 @@
DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f

104
app-emulation/open-vm-tools-kmod/files/fragsize.patch
View file

@ -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);

28
app-emulation/open-vm-tools-kmod/files/frozen.patch
View file

@ -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;

32
app-emulation/open-vm-tools-kmod/files/hardened.patch
View file

@ -1,32 +0,0 @@
--- modules/linux/vsock/linux/af_vsock.c.orig 2013-04-18 05:42:22.000000000 +0800
+++ modules/linux/vsock/linux/af_vsock.c 2013-06-01 08:12:53.669508310 +0800
@@ -3185,10 +3185,14 @@
* else in the future.
*/
for (i = NPROTO - 1; i >= 0; i--) {
- vsockVmciFamilyOps.family = i;
+ pax_open_kernel();
+ *(int *)&vsockVmciFamilyOps.family = i;
+ pax_close_kernel();
err = sock_register(&vsockVmciFamilyOps);
if (err) {
- vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
+ pax_open_kernel();
+ *(int *)&vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
+ pax_close_kernel();
} else {
vsockVmciDgramOps.family = i;
vsockVmciStreamOps.family = i;
@@ -3230,8 +3234,10 @@
sock_unregister(vsockVmciFamilyOps.family);
}
- vsockVmciDgramOps.family = vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
- vsockVmciStreamOps.family = vsockVmciFamilyOps.family;
+ pax_open_kernel();
+ *(int *)&vsockVmciDgramOps.family = *(int *)&vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
+ *(int *)&vsockVmciStreamOps.family = vsockVmciFamilyOps.family;
+ pax_close_kernel();
}

79
app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
View file

@ -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="pax_kernel"
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_user
use pax_kernel && epatch "${FILESDIR}/hardened.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}"
}

1
app-emulation/open-vm-tools/Manifest
View file

@ -1 +0,0 @@
DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f

22
app-emulation/open-vm-tools/files/network
View file

@ -1,22 +0,0 @@
#!/bin/sh
#
# net.eth0, net.eth1, network, wicd, NetworkManager
service="net.eth0"
if ! rc-service -e ${service}
then
service="network"
fi
case "$1" in
suspend-vm)
rc-service ${service} stop
;;
resume-vm)
rc-service ${service} start
;;
*)
;;
esac

2
app-emulation/open-vm-tools/files/open-vm-tools.confd
View file

@ -1,2 +0,0 @@
# Set this to no to disable drag and drop (and vmblock) loading.
VM_DRAG_AND_DROP="yes"

7
app-emulation/open-vm-tools/files/open-vm-tools.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Exec=vmware-user-suid-wrapper
Name=VMware User Agent
X-KDE-autostart-phase=1
NoDisplay=true

76
app-emulation/open-vm-tools/files/open-vm-tools.initd
View file

@ -1,76 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.3 2011/07/17 13:23:00 vadimk Exp $
DND_TMPDIR="/tmp/VMwareDnD"
USER_GROUP="root:vmware"
DND_TMPDIR_PERMS="1777"
GUESTD_BIN="/usr/bin/vmtoolsd"
PIDFILE="/var/run/vmtoolsd.pid"
MOUNTPOINT="/proc/fs/vmblock/mountPoint"
depend() {
before checkfs fsck net X
}
start() {
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
if ! grep -q -w vmblock /proc/modules;
then
ebegin "Loading vmblock module"
modprobe vmblock
eend $?
sleep 0.25
fi
if [[ ! -d "${DND_TMPDIR}" ]];
then
# einfo "Creating the VM drag and drop directory"
mkdir "${DND_TMPDIR}"
chown "${USER_GROUP}" "${DND_TMPDIR}"
chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
fi
# DnD_TMPDIR must exist before vmblock can be mounted
ebegin "Mounting vmblock device"
mount -t vmblock none ${MOUNTPOINT}
eend $?
fi
ebegin "Starting vmtoolsd"
start-stop-daemon --user "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
eend $?
}
stop() {
local ret
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
ebegin "Cleaning the contents of ${DND_TMPDIR}"
# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
then
rm -rf ${DND_TMPDIR}/*
ret=0
else
eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
ret=1
fi
eend $ret
ebegin "Unmounting vmblock device"
if grep -q -w "${MOUNTPOINT}" /proc/mounts;
then
umount ${MOUNTPOINT} 1>&2 > /dev/null
fi
eend 0
fi
ebegin "Stopping vmtoolsd"
start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
eend $?
}

114
app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359.ebuild
View file

@ -1,114 +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/open-vm-tools-2012.12.26.958366.ebuild,v 1.1 2013/01/20 12:09:54 vadimk Exp $
EAPI="4"
inherit eutils multilib pam user versionator flag-o-matic toolchain-funcs
MY_PV="$(replace_version_separator 3 '-')"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc fuse icu +pic xinerama"
RDEPEND="app-emulation/open-vm-tools-kmod
dev-libs/glib:2
dev-libs/libdnet
sys-apps/ethtool
sys-process/procps
virtual/pam
X? (
dev-cpp/gtkmm:2.4
x11-base/xorg-server
x11-drivers/xf86-input-vmmouse
x11-drivers/xf86-video-vmware
x11-libs/gtk+:2
x11-libs/libnotify
x11-libs/libX11
x11-libs/libXtst
)
fuse? ( sys-fs/fuse )
icu? ( dev-libs/icu )
xinerama? ( x11-libs/libXinerama )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
virtual/pkgconfig
virtual/linux-sources
sys-apps/findutils
"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup vmware
}
src_prepare() {
# Do not filter out Werror
# Upstream Bug http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
}
src_configure() {
# http://bugs.gentoo.org/402279
if has_version '>=sys-process/procps-3.3.2'; then
export CUSTOM_PROCPS_NAME=procps
export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
fi
econf \
--with-procps \
--with-dnet \
--without-kernel-modules \
$(use_enable doc docs) \
--docdir=/usr/share/doc/${PF} \
$(use_with X x) \
$(use_with X gtk2) \
$(use_with X gtkmm) \
$(use_with icu) \
$(use_with pic) \
$(use_enable xinerama multimon)
# Bugs 260878, 326761
find ./ -name Makefile | xargs sed -i -e 's/-Werror//g' || die "sed out Werror failed"
}
src_install() {
default
rm "${D}"/etc/pam.d/vmtoolsd
pamd_mimic_system vmtoolsd auth account
rm "${D}"/usr/$(get_libdir)/*.la
rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
exeinto /etc/vmware-tools/scripts/vmware/
doexe "${FILESDIR}"/network
if use X;
then
fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
dobin "${S}"/scripts/common/vmware-xdg-detect-de
insinto /etc/xdg/autostart
doins "${FILESDIR}/open-vm-tools.desktop"
elog "To be able to use the drag'n'drop feature of VMware for file"
elog "exchange, please add the users to the 'vmware' group."
fi
elog "Add 'vmware-tools' service to the default runlevel."
}