Accepting request 316496 from home:mlatimer:branches:Virtualization:VMware
Update to 9.10.2 OBS-URL: https://build.opensuse.org/request/show/316496 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=300
This commit is contained in:
Git OBS Bridge
parent
373bb969a1
commit
512898fd89
@ -1,24 +0,0 @@
|
||||
--- open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h.orig 2015-04-30 20:27:54.197056616 -0700
|
||||
+++ open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h 2015-04-30 20:47:22.916480187 -0700
|
||||
@@ -352,7 +352,9 @@
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
||||
+#if defined(__GNUC__) && \
|
||||
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
||||
+ !defined(MUL64_NO_ASM)
|
||||
|
||||
static INLINE uint64
|
||||
Mul64x3264(uint64 multiplicand, uint32 multiplier, uint32 shift)
|
||||
@@ -457,7 +459,9 @@
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
||||
+#if defined(__GNUC__) && \
|
||||
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
||||
+ !defined(MUL64_NO_ASM)
|
||||
|
||||
static INLINE int64
|
||||
Muls64x32s64(int64 multiplicand, uint32 multiplier, uint32 shift)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e146ad53d744d7793ee72c5271fc49a916613534c14827c227fdaef4b3579c96
|
||||
size 4093306
|
||||
3
open-vm-tools-9.10.2-2822639.tar.gz
Normal file
3
open-vm-tools-9.10.2-2822639.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6c5a7f88b597585a273fb9918fdb9201c79e30731a765fbec1acda14d1f3d74c
|
||||
size 4044062
|
||||
@ -1,9 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 13 16:16:02 UTC 2015 - mlatimer@suse.com
|
||||
|
||||
- Update to open-vm-tools-9.10.2-2822639
|
||||
+ Fix various compilation errors
|
||||
+ Retry sending vmbackup event with elevated privileges
|
||||
+ Add a -h option to vgauth
|
||||
+ Workaround NFS open bug by retrying on ESTALE
|
||||
+ Fix the HGFS protocol opcode to differentiate headers
|
||||
+ Thaw filesystems when the snapshot commit message to VMX fails
|
||||
- Drop upstream patches included in 9.10.2:
|
||||
- toolboxcmd-fix-logic.patch
|
||||
- asm_x86.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 28 10:56:24 UTC 2015 - antoine.belvire@laposte.net
|
||||
|
||||
- Fix compilation issues with GCC 5:
|
||||
* Add toolboxcmd-fix-logic.patch
|
||||
* Add asm_x86.patch
|
||||
* Add asm_x86.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 21 23:04:48 UTC 2015 - mlatimer@suse.com
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package open-vm-tools-KMP
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -17,7 +17,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define KMP 1
|
||||
%define KMP 1
|
||||
|
||||
# systemd and deploypkg should be enabled by default on versions >= 13.1
|
||||
%if 0%{?suse_version} >= 1310
|
||||
@ -58,14 +58,14 @@
|
||||
|
||||
Name: open-vm-tools-KMP
|
||||
%define tarname open-vm-tools
|
||||
Version: 9.10.0
|
||||
Version: 9.10.2
|
||||
Release: 0
|
||||
%define svn_rev 2476743
|
||||
%define svn_rev 2822639
|
||||
Summary: Open Virtual Machine Tools
|
||||
License: BSD-3-Clause and GPL-2.0 and LGPL-2.1
|
||||
Group: System/Emulators/PC
|
||||
Url: http://open-vm-tools.sourceforge.net/
|
||||
Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-9.10.0/%{tarname}-%{version}-%{svn_rev}.tar.gz
|
||||
Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-9.10.2/%{tarname}-%{version}-%{svn_rev}.tar.gz
|
||||
Source1: vmtoolsd
|
||||
Source2: vmtoolsd.service
|
||||
Source3: vmware-user-autostart.desktop
|
||||
@ -130,10 +130,6 @@ Patch2: 0001-Fix-vmxnet-module-on-kernels-3.16.patch
|
||||
Patch3: 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
|
||||
Patch4: 0003-Fix-f_dentry-msghdr-kernel-3.19.patch
|
||||
Patch5: 0004-vmhgfs-bdi-kernel-4.0.patch
|
||||
# PATCH-FIX-UPSTREAM toolboxcmd-fix-logic.patch -- fix build with gcc5 (from Fedora)
|
||||
Patch6: toolboxcmd-fix-logic.patch
|
||||
# PATCH-FIX-UPSTREAM asm_x86.patch -- fix build with gcc 5 on i586 (from Fedora)
|
||||
Patch7: asm_x86.patch
|
||||
|
||||
%if %{KMP}
|
||||
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
|
||||
@ -240,8 +236,6 @@ sed -i -e "s/\r//" README
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
%if ! %{KMP}
|
||||
@ -268,6 +262,8 @@ export LDFLAGS="-pie"
|
||||
export CUSTOM_PROCPS_NAME=procps
|
||||
autoreconf -fi
|
||||
echo 'HTML_TIMESTAMP=NO' >> docs/api/doxygen.conf
|
||||
# In the latest official tarballs, configure is not marked executable
|
||||
chmod 755 configure
|
||||
%configure \
|
||||
--without-kernel-modules \
|
||||
--without-root-privileges \
|
||||
@ -304,12 +300,7 @@ for flavor in %{flavors_to_build}; do
|
||||
if [ -f ../vmci/Module.symvers ]; then
|
||||
cp ../vmci/Module.symvers .
|
||||
fi
|
||||
# SUSE versions below 1110 must use gcc 4.7 to compile for i586
|
||||
%if 0%{?suse_version} > 1110
|
||||
export CC_VER_OPTS="VM_CCVER=$(gcc -dumpversion)"
|
||||
%else
|
||||
export CC_VER_OPTS="CC=gcc-4.7 VM_CCVER=4.7"
|
||||
%endif
|
||||
export CC_VER_OPTS="VM_CCVER=$(gcc -dumpversion)"
|
||||
make -C /usr/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD $CC_VER_OPTS HEADER_DIR="/usr/src/linux-obj/$(uname -i)/default/include" SRCROOT=$PWD OVT_SOURCE_DIR=$TOPDIR
|
||||
popd
|
||||
done
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 13 16:16:02 UTC 2015 - mlatimer@suse.com
|
||||
|
||||
- Update to open-vm-tools-9.10.2-2822639
|
||||
+ Fix various compilation errors
|
||||
+ Retry sending vmbackup event with elevated privileges
|
||||
+ Add a -h option to vgauth
|
||||
+ Workaround NFS open bug by retrying on ESTALE
|
||||
+ Fix the HGFS protocol opcode to differentiate headers
|
||||
+ Thaw filesystems when the snapshot commit message to VMX fails
|
||||
- Drop upstream patches included in 9.10.2:
|
||||
- toolboxcmd-fix-logic.patch
|
||||
- asm_x86.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 28 10:56:24 UTC 2015 - antoine.belvire@laposte.net
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package open-vm-tools
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -58,14 +58,14 @@
|
||||
|
||||
Name: open-vm-tools
|
||||
%define tarname open-vm-tools
|
||||
Version: 9.10.0
|
||||
Version: 9.10.2
|
||||
Release: 0
|
||||
%define svn_rev 2476743
|
||||
%define svn_rev 2822639
|
||||
Summary: Open Virtual Machine Tools
|
||||
License: BSD-3-Clause and GPL-2.0 and LGPL-2.1
|
||||
Group: System/Emulators/PC
|
||||
Url: http://open-vm-tools.sourceforge.net/
|
||||
Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-9.10.0/%{tarname}-%{version}-%{svn_rev}.tar.gz
|
||||
Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-9.10.2/%{tarname}-%{version}-%{svn_rev}.tar.gz
|
||||
Source1: vmtoolsd
|
||||
Source2: vmtoolsd.service
|
||||
Source3: vmware-user-autostart.desktop
|
||||
@ -130,10 +130,6 @@ Patch2: 0001-Fix-vmxnet-module-on-kernels-3.16.patch
|
||||
Patch3: 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
|
||||
Patch4: 0003-Fix-f_dentry-msghdr-kernel-3.19.patch
|
||||
Patch5: 0004-vmhgfs-bdi-kernel-4.0.patch
|
||||
# PATCH-FIX-UPSTREAM toolboxcmd-fix-logic.patch -- fix build with gcc5 (from Fedora)
|
||||
Patch6: toolboxcmd-fix-logic.patch
|
||||
# PATCH-FIX-UPSTREAM asm_x86.patch -- fix build with gcc 5 on i586 (from Fedora)
|
||||
Patch7: asm_x86.patch
|
||||
|
||||
%if %{KMP}
|
||||
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
|
||||
@ -240,8 +236,6 @@ sed -i -e "s/\r//" README
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
%if ! %{KMP}
|
||||
@ -268,6 +262,8 @@ export LDFLAGS="-pie"
|
||||
export CUSTOM_PROCPS_NAME=procps
|
||||
autoreconf -fi
|
||||
echo 'HTML_TIMESTAMP=NO' >> docs/api/doxygen.conf
|
||||
# In the latest official tarballs, configure is not marked executable
|
||||
chmod 755 configure
|
||||
%configure \
|
||||
--without-kernel-modules \
|
||||
--without-root-privileges \
|
||||
@ -304,12 +300,7 @@ for flavor in %{flavors_to_build}; do
|
||||
if [ -f ../vmci/Module.symvers ]; then
|
||||
cp ../vmci/Module.symvers .
|
||||
fi
|
||||
# SUSE versions below 1110 must use gcc 4.7 to compile for i586
|
||||
%if 0%{?suse_version} > 1110
|
||||
export CC_VER_OPTS="VM_CCVER=$(gcc -dumpversion)"
|
||||
%else
|
||||
export CC_VER_OPTS="CC=gcc-4.7 VM_CCVER=4.7"
|
||||
%endif
|
||||
export CC_VER_OPTS="VM_CCVER=$(gcc -dumpversion)"
|
||||
make -C /usr/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD $CC_VER_OPTS HEADER_DIR="/usr/src/linux-obj/$(uname -i)/default/include" SRCROOT=$PWD OVT_SOURCE_DIR=$TOPDIR
|
||||
popd
|
||||
done
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- open-vm-tools-9.10.0-2476743.orig/toolbox/toolboxcmd-shrink.c 2015-03-19 15:53:25.000000000 -0700
|
||||
+++ open-vm-tools-9.10.0-2476743/toolbox/toolboxcmd-shrink.c 2015-04-29 17:35:12.190392096 -0700
|
||||
@@ -391,7 +391,7 @@
|
||||
* Verify that wiping/shrinking are permitted before going through with the
|
||||
* wiping operation.
|
||||
*/
|
||||
- if (!ShrinkGetWiperState() == WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
|
||||
+ if (ShrinkGetWiperState() != WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
|
||||
g_debug("%s cannot be wiped / shrunk\n", mountPoint);
|
||||
ToolsCmd_PrintErr("%s",
|
||||
SU_(disk.shrink.disabled, SHRINK_DISABLED_ERR));
|
||||
Loading…
Reference in New Issue
Block a user