Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2012-04-12 09:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2012-03-16 13:20:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2012-04-12 09:44:11.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Mar 30 21:02:32 UTC 2012 - [email protected] + +- Build vmci as first module and copy Modules.symvers to source of + all subsequent modules to be built. Fixes issues where vmhgfs for + example does not have all symbols available and fails to load + [bnc#703959]. + +------------------------------------------------------------------- +Fri Mar 30 20:02:49 UTC 2012 - [email protected] + +- Add a tools.conf to the package. All settings are left to default + except [guestinfo] / disable-perf-mon=1, which resolves + bnc#698181. + +------------------------------------------------------------------- New: ---- tools.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.cEu2iJ/_old 2012-04-12 09:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.cEu2iJ/_new 2012-04-12 09:44:12.000000000 +0200 @@ -26,7 +26,7 @@ %endif # Modules that have to be build up to version 12.2 (Last checked on 2012-02-05 with kernel 3.2.0) -%define vm_modules vmblock vmhgfs vmsync vmci vsock %{?vm_modules1210} +%define vm_modules vmci vmblock vmhgfs vmsync vsock %{?vm_modules1210} # X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them. %define with_X 1 @@ -45,6 +45,7 @@ Source4: open-vm-tools.permissions Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf +Source7: tools.conf Source98: preamble Patch0: vmhgfs-2011.12.20.patch BuildRequires: gcc-c++ @@ -57,7 +58,6 @@ BuildRequires: libicu-devel BuildRequires: module-init-tools BuildRequires: pcre-devel -BuildRequires: procps BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -203,6 +203,9 @@ pushd obj/$flavor for module in %{vm_modules}; do pushd modules/linux/$module + if [ -f ../vmci/Module.symvers ]; then + cp ../vmci/Module.symvers . + fi make -C /usr/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD VM_CCVER=$(gcc -dumpversion) HEADER_DIR="/usr/src/linux-obj/$(uname -i)/default/include" SRCROOT=$PWD OVT_SOURCE_DIR=$TOPDIR popd done @@ -246,6 +249,9 @@ install -D -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop +# Install the default tools.conf +install -D -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/vmware-tools/tools.conf + # In case we install vmware-user-suid-wrapper, we need to give it 4755 permissions. #install -D -m 0644 %%{S:4} %%{buildroot}%%{_sysconfdir}/permissions.d/open-vm-tools @@ -339,7 +345,18 @@ %{_sbindir}/mount.vmhgfs /sbin/mount.vmhgfs %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd -%{_sysconfdir}/vmware-tools +%dir %{_sysconfdir}/vmware-tools +%dir %{_sysconfdir}/vmware-tools/scripts +%dir %{_sysconfdir}/vmware-tools/scripts/vmware +%{_sysconfdir}/vmware-tools/plugins +%{_sysconfdir}/vmware-tools/poweroff-vm-default +%{_sysconfdir}/vmware-tools/poweron-vm-default +%{_sysconfdir}/vmware-tools/resume-vm-default +%{_sysconfdir}/vmware-tools/scripts/vmware/network +%{_sysconfdir}/vmware-tools/statechange.subr +%{_sysconfdir}/vmware-tools/suspend-vm-default +%config(noreplace) %{_sysconfdir}/vmware-tools/tools.conf +%{_sysconfdir}/vmware-tools/vm-support %{_sysconfdir}/init.d/vmtoolsd %{_sysconfdir}/modprobe.d/50-vmnics.conf %{_sbindir}/rcvmtoolsd ++++++ tools.conf ++++++ # Sample tools.conf for open-vm-tools [powerops] ## Type: String ## Default: [empty] #poweron-script= ## Type: String ## Default: [[empty] #poweroff-script= ## Type: String ## Default: [empty] #resume-script= ## Type: string ## Default: [empty] #suspend-script= [vmsvc] ## Type: int ## Default: 512 #max.wiperfile.size=512 [vmtools] ## Type: ## Default: false #disable-tools-version=false [vmtray] ## Type: Boolean ## Default: False #wirelessIcon.enable=false [desktopevents] ## Type: Boolean ## Default: False #disable-pmtimerarning=false [logging] ## Type: Boolean ## Default: #log= ## Type: String ## Default: [empty] #log.file ## Type: String(error,critical,warning,message,info,debug,none) ## Default: warning #log.level=warning [guestinfo] ## Type: Boolean ## Default: 0 # Set to one on openSUSE, as there is no libprocps and this keeps on flooding the logs # see bnc#698181 for more details. disable-perf-mon=1 ## Type: Boolean ## Default: #disable-query-diskinfo= # Custom GuetInfo Poll interval (in seconds). Set to 0 to disable polling ## Type: Int ## Default: #poll-interval= [unity] ## Type: ## Default: #debug= ## Type: Boolean ## Default: #forceEnable= ## Type: String ## Default: #desktop.backgroundColor= # Enable (or disable) the Protocol Buffer enabled service ## Type: Boolean ## Default: #pbrpc.enable= # Configure the socket type for PBRPC (ipsocket,vsocket) ## Type: String(ipsocket,vsocket) ## Default: #pbrpc.socketType= -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
