Accepting request 38976 from home:dimstar:branches:Virtualization:VMware
Copy from home:dimstar:branches:Virtualization:VMware/open-vm-tools via accept of submit request 38976 revision 7. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/38976 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=159
This commit is contained in:
Git OBS Bridge
parent
2a107aed2a
commit
5d0168b1fa
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 22 11:25:39 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Re-introduce vmxnet3 on openSUSE <= 11.2. Up to then we have
|
||||
kernel 2.26.31, which does not bring the vmxnet3 driver yet.
|
||||
The driver itself is the last one shipped with open-vm-tools,
|
||||
version 2009.12.16.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 21 10:36:21 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Send SIGUSR1 to vmtools-user process when the services are being
|
||||
stopped. This possibly solves bnc#544400.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 7 10:44:31 UTC 2010 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
# spec file for package open-vm-tools (Version 2010.03.20)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,12 +20,13 @@
|
||||
|
||||
# exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
|
||||
%define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
|
||||
%define build_vmxnet3 0%{suse_version} <= 1120
|
||||
|
||||
Name: open-vm-tools
|
||||
Group: System/Emulators/PC
|
||||
Summary: Open Virtual Machine Tools
|
||||
Version: 2010.03.20
|
||||
Release: 2
|
||||
Release: 1
|
||||
%define svn_rev 243334
|
||||
Url: http://open-vm-tools.sourceforge.net/
|
||||
License: BSD3c ; GPLv2 ; LGPLv2.1
|
||||
@ -35,6 +37,10 @@ Source3: vmware-toolbox.desktop
|
||||
Source4: open-vm-tools.permissions
|
||||
Source5: vmware-user-autostart-wrapper
|
||||
Source6: open-vm-tools-modprobe.conf
|
||||
# VMXNET3 driver is extracted from open-vm-tools 2009.12,16 last one that carried it.
|
||||
# We keep it in for compatibility of older openSUSE Releases that have a kernel < 2.26.32. From then on,
|
||||
# vmxnet3 is part of the kernel.
|
||||
Source7: vmxnet3.tar.bz2
|
||||
Source98: preamble
|
||||
# PATCH-FIX-UPSTREAM open-vm-tools-libpng14.patch sf#2983141 dimstar@opensuse.org -- Fix build with libpng 1.4
|
||||
Patch0: open-vm-tools-libpng14.patch
|
||||
@ -61,7 +67,12 @@ PreReq: permissions
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
Requires: vmware-guest-kmp
|
||||
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
|
||||
|
||||
%if %build_vmxnet3
|
||||
%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi vmxnet3
|
||||
%else
|
||||
%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi
|
||||
%endif
|
||||
|
||||
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
|
||||
|
||||
@ -149,6 +160,11 @@ if you intend to create own plugins for vmtoolsd.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-%{svn_rev}
|
||||
%if %build_vmxnet3
|
||||
pushd modules/linux
|
||||
tar xvf %{S:7}
|
||||
popd
|
||||
%endif
|
||||
%patch0 -p1
|
||||
chmod -x AUTHORS COPYING ChangeLog NEWS README
|
||||
# fix for an rpmlint warning regarding wrong line feeds
|
||||
|
||||
7
vmtoolsd
7
vmtoolsd
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Template SUSE system startup script for vmware-guest service/daemon
|
||||
# Copyright (C) 2008 Dominique Leuenberger for openSUSE
|
||||
# Copyright (C) 2008-2010 Dominique Leuenberger for openSUSE
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
@ -35,6 +35,7 @@
|
||||
# Check for missing binaries (stale symlinks should not happen)
|
||||
# Note: Special treatment of stop for LSB conformance
|
||||
VMTOOLSD_BIN=/usr/bin/vmtoolsd
|
||||
VMTOOLSUSER_BIN=/usr/bin/vmtools-user
|
||||
test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed";
|
||||
if [ "$1" = "stop" ]; then exit 0;
|
||||
else exit 5; fi; }
|
||||
@ -82,6 +83,10 @@ case "$1" in
|
||||
## Stop daemon with killproc(8) and if this fails
|
||||
## killproc sets the return value according to LSB.
|
||||
|
||||
# We need to inform the User process that we're going down.
|
||||
# Otherwise it keeps references on /proc/fs/vmblock/* and
|
||||
# causes issues when reloading vmblock module.
|
||||
/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
|
||||
/sbin/killproc -TERM $VMTOOLSD_BIN
|
||||
umount /proc/fs/vmblock/mountPoint || :
|
||||
modprobe -r vmblock || :
|
||||
|
||||
3
vmxnet3.tar.bz2
Normal file
3
vmxnet3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8009d53dde71c4f99f4b1c61194682c97069506cf637beb743c670e97d18a979
|
||||
size 39147
|
||||
Loading…
x
Reference in New Issue
Block a user