Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Wed Jun 9 17:31:33 CEST 2010. -------- --- open-vm-tools/open-vm-tools.changes 2010-04-07 12:46:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes 2010-06-07 11:36:13.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Jun 7 08:48:19 UTC 2010 - dimstar@opensuse.org + +- Add vmmemctl.tar.bz2, extracted from open-vm-tools 2010.02.23. + +------------------------------------------------------------------- +Mon May 31 08:37:32 UTC 2010 - dimstar@opensuse.org + +- Better logic to easily disable modules that got inlcluded in the + Linux Kernel, for bnc#605085. + +------------------------------------------------------------------- +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 vmware-user process when the services are being + stopped. This possibly solves bnc#544400. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vmmemctl.tar.bz2 vmxnet3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.aFwuCF/_old 2010-06-09 17:30:38.000000000 +0200 +++ /var/tmp/diff_new_pack.aFwuCF/_new 2010-06-09 17:30:38.000000000 +0200 @@ -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 @@ -20,11 +21,20 @@ # 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' +# Modules that have to be build up to version 11.3 +%if 0%{suse_version} <= 1130 +%define mod1130 vmblock vmhgfs vmsync vmxnet vmci vsock +%endif +# Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is expanded by this. +%if 0%{suse_version} <= 1120 +%define mod1120 pvscsi vmmemctl vmxnet3 +%endif + Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools Version: 2010.03.20 -Release: 2 +Release: 3 %define svn_rev 243334 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 @@ -35,6 +45,12 @@ 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 +# vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23 +Source8: vmmemctl.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 +77,8 @@ ExclusiveArch: %ix86 x86_64 Requires: vmware-guest-kmp Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) -%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi + +%define vm_modules %{?mod1130} %{?mod1120} %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -149,6 +166,10 @@ %prep %setup -q -n %{name}-%{version}-%{svn_rev} +pushd modules/linux +tar xvf %{S:7} +tar xvf %{S:8} +popd %patch0 -p1 chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds ++++++ vmtoolsd ++++++ --- /var/tmp/diff_new_pack.aFwuCF/_old 2010-06-09 17:30:38.000000000 +0200 +++ /var/tmp/diff_new_pack.aFwuCF/_new 2010-06-09 17:30:38.000000000 +0200 @@ -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/vmware-user test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } @@ -82,6 +83,10 @@ ## 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 || : ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org