Hello community, here is the log from the commit of package open-vm-tools checked in at Sat Sep 6 02:58:43 CEST 2008. -------- --- arch/i386/open-vm-tools/open-vm-tools.changes 2008-06-12 16:24:40.000000000 +0200 +++ open-vm-tools/open-vm-tools.changes 2008-09-04 11:21:31.000000000 +0200 @@ -1,0 +2,104 @@ +Thu Sep 4 11:15:26 CEST 2008 - prusnak@suse.cz + +- reviewed changes by Dominique + +------------------------------------------------------------------- +Wed Sep 3 21:16:41 CEST 2008 - dominique@leuenberger.net + +- Activated compilation of modules vmci and vsock after fixing the + kver.patch +- dropped obsoleted patch: + * str_c.patch (included in update) + +------------------------------------------------------------------- +Wed Sep 3 11:10:15 CEST 2008 - prusnak@suse.cz + +- updated to 2008-09-03 + * Fixed an issue where open-vm-tools fails to configure when using + --without-icu. Thanks to Timo Gurr for reporting the issue + (Sourceforge bug 2046262). + * Fixed failed build on Ubuntu Intrepid and Fedora 9. + Thanks to Nathan Charles for reporting the issue + (Sourceforge bug 2048423). + * Fixed kernel module build issues on 2.6.27 pre-release kernels. + Thanks to Dominique Leuenberger for reporting the issue + (Sourceforge bug 2071170). + * ...and other bug fixes. +- dropped obsoleted patches: + * 2.6.27-kernel.patch (included in update) + * fix-Werror.patch (included in update) + +------------------------------------------------------------------- +Sun Aug 24 19:35:41 CEST 2008 - dominique@leuenberger.net + +- Added open-vm-tools-2008-08-08-2.6.27-kernel.patch to compile on + more recent kernels (patch should be merged in next release) + +------------------------------------------------------------------- +Fri Aug 22 16:49:41 CEST 2008 - dominique@leuenberger.net + +- added packageand(open-vm-tools:xorg-x11) to Supplements + of open-vm-tools-gui sub package + +------------------------------------------------------------------ +Fri Aug 22 07:30:15 CEST 2008 - dominique@leuenberger.net + + - Re-arranged comments for the configure line. Apparently, comments + that appear in a line continuing on the next line, split using '\' + break the flow + +------------------------------------------------------------------- +Wed Aug 20 23:02:15 CEST 2008 - dominique@leuenberger.net + +- Added --without-kernel-modules to configure, as we take + care of it on ourself using the loop, for the different + kernel variants + +------------------------------------------------------------------- +Fri Aug 12 16:17:07 CEST 2008 - prusnak@suse.cz + +- updated to 2008.08.08 + * Unity for X11 guests has been added. Unity is implemented within + vmware-user and requires no additional setup beyond setting up the + vmware-user application itself. Unity should work with Fusion 1.x + releases as well as with the upcoming Workstation 6.5 release. Our + in-house testing was with Linux guests, and they should mostly work. + There is very little standing in the way of FreeBSD/Solaris support, + though we've never built or tested Unity for those platforms. + * The VMCI Linux kernel module has been added. This module provides + high-speed datagram and socket interfaces for guest<->guest and + host<->guest communication. It should work for all kernels beginning + with 2.4, and for VMware products beginning with Workstation 6.5. + * The VMCI sockets Linux kernel module has been added. It provides + both datagram and stream socket interfaces to userlevel for use with + VMCI. As with VMCI, it should work for kernels 2.4 or later, and for + VMware products beginning with Workstation 6.5. + * The command-line Toolbox has been added. This application provides + the same functionality as the GTK Toolbox, but with a scriptable + command-line interface. It also has some statistic retrieval commands + that aren't found in the GTK Toolbox. + * Fixed compilation of vmsync and vmmemctl Linux kernel modules on + 2.6.26. Thanks to Pavol Rusnak for the report (Sourceforge bug 2032683). + * Fixed an issue with guestd's nicInfo updating mechanism. Thanks to + Jason Lunz for the patch (not tracked on Sourceforge). + * Fixed handling of $(DESTDIR) in automake. Thanks to Mike Auty for + the patch (Sourceforge bug 2018802). + * Fixed build of vmware-user using gtk 1.2. Thanks to Stephen Duncan + for the report (Sourceforge bug 2014338). + * Fixed compilation of lib/guestApp when using --without-x. Thanks to + Martin Preishuber for the report (Sourceforge bug 2013568). + * As usual, other bug fixes. + +------------------------------------------------------------------ +Mon Jul 21 17:02:15 CEST 2008 - prusnak@suse.cz + +- updated to 2008.07.01: + * fixed a backwards time synchronization issue + * fixed an issue where open-vm-tools configured via --without-x didn't + compile (not tracked on Sourceforge) + * one can now pass --without-kernel-modules, --with-kernel-release, and + --with-linuxdir to the ./configure script + * other bug fixes. +- branched open-vm-tools-gui subpackage with tools that need X + +------------------------------------------------------------------- @@ -7,0 +112,10 @@ +Mon Jun 9 22:49:17 EEST 2008 - dominique-obs@leuenberger.net + +- Updated to version 2008.06.03 + adopted spec file to new build structure layout (the binaries + are now named correctly just after build and do not need to + be renamed anymore) +- Replaced -werror patch with -fix-Werror-patch (submitted to + VMware for inclusion) + +------------------------------------------------------------------- @@ -15,0 +130,7 @@ +Tue May 27 21:00:00 EST 2008 - dominique-rpm@leuenberger.net + +- Excluded the building of KMPs for XEN, probably nobody installs + a vmware host in xen. + +------------------------------------------------------------------- + @@ -22,0 +144,36 @@ +Tue May 20 17:00:00 EET 2008 - dominique-rpm@leuenberger.net + +- replaced %build section with the one from openSUSE internal + stable build, for building properly against all buildtargets + +------------------------------------------------------------------- +Tue May 20 16:43:00 EET 2008 - dominique-rpm@leuenberger.net + +- Added preamble for %suse_kernel_module_package in order to have + a Recommends: open-vm-tools on the kmp. + The KMP is installed by Supplements: the hardware ID, and the KMP + then pulls in the open-vm-tools package by Recommends (if available) + +------------------------------------------------------------------- +Tue May 7 07:26:00 EET 2008 - dominique-rpm@leuenberger.net + +- Updated to 2008.05.15: + * Removed "blessed app" code for starting vmware-user + * lib/file/filePosix.c: Use new Posix_RealPath implementation. + * Cleanup UTF-8 handling. + +------------------------------------------------------------------- +Tue May 7 07:26:00 EET 2008 - dominique-rpm@leuenberger.net + +- Added patch open-vm-tools-2008.05.02-str.c that should solve + compilation with FORTIFY_SOURCE enabled + +------------------------------------------------------------------- +Tue May 6 10:35:42 CEST 2008 - prusnak@suse.cz + +- updated to 2008.05.02: + * continued Unicode support + * open-vm-tools now depends on libicu for codeset conversions + * a few more bug fixes + +------------------------------------------------------------------- Old: ---- open-vm-tools-2008.04.14-87182.tar.bz2 open-vm-tools-2008.04.14-kver.patch open-vm-tools-2008.04.14-rpmlintrc open-vm-tools-2008.04.14-werror.patch xautostart.conf New: ---- open-vm-tools-2008.09.03-114782.tar.bz2 open-vm-tools-2008.09.03-kver.patch open-vm-tools-2008.09.03-rpmlintrc vmware-user.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.q29723/_old 2008-09-06 02:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.q29723/_new 2008-09-06 02:45:03.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package open-vm-tools (Version 2008.04.14) +# spec file for package open-vm-tools (Version 2008.09.03) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,32 +22,38 @@ Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools -Version: 2008.04.14 -Release: 23 -%define svn_rev 87182 +Version: 2008.09.03 +Release: 1 +%define svn_rev 114782 Url: http://open-vm-tools.sourceforge.net/ License: BSD 3-Clause; GPL v2 only; LGPL v2.1 only Source: %{name}-%{version}-%{svn_rev}.tar.bz2 Source1: vmware-guest -Source2: xautostart.conf +Source2: vmware-user.desktop Source3: vmware-toolbox.desktop -Source4: %{name}-%{version}-rpmlintrc -Source5: preamble +Source4: preamble +Source99: %{name}-%{version}-rpmlintrc Patch0: %{name}-%{version}-kver.patch -Patch1: %{name}-%{version}-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: kernel-source kernel-syms -BuildRequires: procps -BuildRequires: gtk2-devel xorg-x11-devel -BuildRequires: update-desktop-files -BuildRequires: module-init-tools -PreReq: coreutils sed grep diffutils fillup bash +BuildRequires: gcc-c++ +BuildRequires: kernel-source kernel-syms module-init-tools +BuildRequires: libdnet-devel libicu-devel pcre-devel procps +BuildRequires: gtk2-devel update-desktop-files xorg-x11-devel +# openSUSE 10.2 seems not to pull libtiff in automatically... weird +%if 0%{?suse_version} == 1020 +BuildRequires: libtiff +%endif +# liburiparser was not present before 11.0 +%if 0%{?suse_version} >= 1100 +BuildRequires: liburiparser-devel +%endif +PreReq: %insserv_prereq %fillup_prereq PreReq: permissions ExclusiveArch: %ix86 x86_64 Requires: vmware-kmp Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) -%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet -%suse_kernel_module_package -n vmware -p %{_sourcedir}/preamble +%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock +%suse_kernel_module_package -n vmware -p %{SOURCE4} xen um %description Open Virtual Machine Tools (open-vm-tools) are the open source @@ -107,14 +120,38 @@ -------- The VMware Guest Components Team +%package gui +License: BSD 3-Clause; GPL v2 only; LGPL v2.1 only +Summary: Open Virtual Machine Tools - GUI +Group: System/Emulators/PC +Requires: open-vm-tools +Supplements: packageand(open-vm-tools:xorg-x11) + +%description gui +GUI Toolbox for Open Virtual Machine Tools + + + +Authors: +-------- + The VMware Guest Components Team + +%debugpackage %prep %setup -q -n %{name}-%{version}-%{svn_rev} %patch0 -%patch1 chmod -x AUTHORS COPYING ChangeLog NEWS README %build -%configure --without-dnet --without-procps --disable-dependency-tracking +# liburiparser was not present before 11.0 (--disable-unity) +# comments in a continued line seem not to work... shame +%configure \ +%if 0%{?suse_version} < 1100 + --disable-unity \ +%endif + --without-kernel-modules \ + --without-procps \ + --disable-dependency-tracking make cd .. mkdir -p obj @@ -125,15 +162,13 @@ #make modules for module in %{vm_modules}; do pushd modules/linux/$module - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules M=$PWD VM_CCVER=4.3 SRCROOT=$PWD + make -C /usr/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD VM_CCVER=$(gcc -dumpversion) SRCROOT=$PWD popd done popd done %install -# make install does almost nothing (only installs one library) -%makeinstall # let's use the kernel's own modules_install routine export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=updates @@ -148,10 +183,15 @@ popd # fix some rights on the kernel modules, to have a complete -debuginfo package chmod u+x $RPM_BUILD_ROOT/lib/modules/*/updates/* +#installation of libguestlib +mkdir -p $RPM_BUILD_ROOT%{_libdir} +install -m 0755 libguestlib/.libs/libguestlib.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libguestlib.so.0.0.0 +ln -s %{_libdir}/libguestlib.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libguestlib.so.0 +ln -s %{_libdir}/libguestlib.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libguestlib.so # installation of vmware-guestd mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -install -m 0755 guestd/guestd $RPM_BUILD_ROOT%{_sbindir}/vmware-guestd +install -m 0755 guestd/vmware-guestd $RPM_BUILD_ROOT%{_sbindir}/vmware-guestd install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vmware-guest # and the corresponding PAM magic for vmware-guestd mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/ @@ -167,8 +207,9 @@ cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-tools/tools.conf bindir = "%{_bindir}" EOF -# and also /etc/vmware-tools/xautostart.conf -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/vmware-tools/xautostart.conf +# and also /etc/xdg/autostart/vmware-user.desktop +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user.desktop # For vmware-guestd to run the default soft power operation scripts, # they must be installed to /etc/vmware-tools with the executable bit activated. install -m 0555 scripts/linux/poweroff-vm-default $RPM_BUILD_ROOT%{_sysconfdir}/vmware-tools/ @@ -181,16 +222,18 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 vmware-user/vmware-user $RPM_BUILD_ROOT%{_bindir} # the toolbox, to be started by the user -install -m 0755 toolbox/toolbox $RPM_BUILD_ROOT%{_bindir}/vmware-toolbox +install -m 0755 toolbox/vmware-toolbox $RPM_BUILD_ROOT%{_bindir}/vmware-toolbox # checkvm is a simple console application. -install -m 0755 checkvm/checkvm $RPM_BUILD_ROOT%{_bindir}/vmware-checkvm +install -m 0755 checkvm/vmware-checkvm $RPM_BUILD_ROOT%{_bindir}/vmware-checkvm # xferlogs is a simple console application. -install -m 0755 xferlogs/xferlogs $RPM_BUILD_ROOT%{_bindir}/vmware-xferlogs +install -m 0755 xferlogs/vmware-xferlogs $RPM_BUILD_ROOT%{_bindir}/vmware-xferlogs # hgfsclient is a simple console application. -install -m 0755 hgfsclient/hgfsclient $RPM_BUILD_ROOT%{_bindir}/vmware-hgfsclient +install -m 0755 hgfsclient/vmware-hgfsclient $RPM_BUILD_ROOT%{_bindir}/vmware-hgfsclient +# install vmware-user-suid-wrapper +install -m 0755 vmware-user-suid-wrapper/vmware-user-suid-wrapper $RPM_BUILD_ROOT/%{_bindir}/vmware-user-suid-wrapper # Install hgfsmounter mkdir -p $RPM_BUILD_ROOT/sbin -cp hgfsmounter/hgfsmounter $RPM_BUILD_ROOT/sbin/mount.vmhgfs +cp hgfsmounter/mount.vmhgfs $RPM_BUILD_ROOT/sbin/mount.vmhgfs # provide a menu entry for the various Desktop Environments mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/applications/vmware-toolbox.desktop @@ -203,8 +246,6 @@ EOF #provide the rcvmware-guest link ln -sf ../../etc/init.d/vmware-guest $RPM_BUILD_ROOT%{_sbindir}/rcvmware-guest -# get rid of the *.la files -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %post %run_permissions @@ -228,6 +269,8 @@ %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/vmware* +%exclude %{_bindir}/vmware-toolbox +%exclude %{_bindir}/vmware-user %config %{_sysconfdir}/init.d/vmware* %{_sysconfdir}/vmware-tools %{_sysconfdir}/modprobe.d/vmnics @@ -236,22 +279,135 @@ %{_sbindir}/vmware* %{_sbindir}/rcvmware-guest %{_libdir}/libguestlib.* + +%files gui +%defattr(-, root, root) +%{_bindir}/vmware-toolbox +%{_bindir}/vmware-user %{_datadir}/applications/vmware* %{_datadir}/pixmaps/vmware* +%{_sysconfdir}/xdg/autostart/vmware-user.desktop %changelog +* Thu Sep 04 2008 prusnak@suse.cz +- reviewed changes by Dominique +* Wed Sep 03 2008 dominique@leuenberger.net +- Activated compilation of modules vmci and vsock after fixing the + kver.patch +- dropped obsoleted patch: + * str_c.patch (included in update) +* Wed Sep 03 2008 prusnak@suse.cz +- updated to 2008-09-03 + * Fixed an issue where open-vm-tools fails to configure when using + --without-icu. Thanks to Timo Gurr for reporting the issue + (Sourceforge bug 2046262). + * Fixed failed build on Ubuntu Intrepid and Fedora 9. + Thanks to Nathan Charles for reporting the issue + (Sourceforge bug 2048423). + * Fixed kernel module build issues on 2.6.27 pre-release kernels. + Thanks to Dominique Leuenberger for reporting the issue + (Sourceforge bug 2071170). + * ...and other bug fixes. +- dropped obsoleted patches: + * 2.6.27-kernel.patch (included in update) + * fix-Werror.patch (included in update) +* Sun Aug 24 2008 dominique@leuenberger.net +- Added open-vm-tools-2008-08-08-2.6.27-kernel.patch to compile on + more recent kernels (patch should be merged in next release) +* Fri Aug 22 2008 dominique@leuenberger.net +- added packageand(open-vm-tools:xorg-x11) to Supplements + of open-vm-tools-gui sub package +* Fri Aug 22 2008 dominique@leuenberger.net +- Re-arranged comments for the configure line. Apparently, comments + that appear in a line continuing on the next line, split using '\' + break the flow +* Thu Aug 21 2008 dominique@leuenberger.net +- Added --without-kernel-modules to configure, as we take + care of it on ourself using the loop, for the different + kernel variants +* Tue Aug 12 2008 prusnak@suse.cz +- updated to 2008.08.08 + * Unity for X11 guests has been added. Unity is implemented within + vmware-user and requires no additional setup beyond setting up the + vmware-user application itself. Unity should work with Fusion 1.x + releases as well as with the upcoming Workstation 6.5 release. Our + in-house testing was with Linux guests, and they should mostly work. + There is very little standing in the way of FreeBSD/Solaris support, + though we've never built or tested Unity for those platforms. + * The VMCI Linux kernel module has been added. This module provides + high-speed datagram and socket interfaces for guest<->guest and + host<->guest communication. It should work for all kernels beginning + with 2.4, and for VMware products beginning with Workstation 6.5. + * The VMCI sockets Linux kernel module has been added. It provides + both datagram and stream socket interfaces to userlevel for use with + VMCI. As with VMCI, it should work for kernels 2.4 or later, and for + VMware products beginning with Workstation 6.5. + * The command-line Toolbox has been added. This application provides + the same functionality as the GTK Toolbox, but with a scriptable + command-line interface. It also has some statistic retrieval commands + that aren't found in the GTK Toolbox. + * Fixed compilation of vmsync and vmmemctl Linux kernel modules on + 2.6.26. Thanks to Pavol Rusnak for the report (Sourceforge bug 2032683). + * Fixed an issue with guestd's nicInfo updating mechanism. Thanks to + Jason Lunz for the patch (not tracked on Sourceforge). + * Fixed handling of $(DESTDIR) in automake. Thanks to Mike Auty for + the patch (Sourceforge bug 2018802). + * Fixed build of vmware-user using gtk 1.2. Thanks to Stephen Duncan + for the report (Sourceforge bug 2014338). + * Fixed compilation of lib/guestApp when using --without-x. Thanks to + Martin Preishuber for the report (Sourceforge bug 2013568). + * As usual, other bug fixes. +* Mon Jul 21 2008 prusnak@suse.cz +- updated to 2008.07.01: + * fixed a backwards time synchronization issue + * fixed an issue where open-vm-tools configured via --without-x didn't + compile (not tracked on Sourceforge) + * one can now pass --without-kernel-modules, --with-kernel-release, and + --with-linuxdir to the ./configure script + * other bug fixes. +- branched open-vm-tools-gui subpackage with tools that need X * Thu Jun 12 2008 prusnak@suse.cz - open-vm-tools now requires vmware-kmp [bnc#397972] - exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554] +* Mon Jun 09 2008 dominique-obs@leuenberger.net +- Updated to version 2008.06.03 + adopted spec file to new build structure layout (the binaries + are now named correctly just after build and do not need to + be renamed anymore) +- Replaced -werror patch with -fix-Werror-patch (submitted to + VMware for inclusion) * Mon Jun 02 2008 prusnak@suse.cz - updated vmware init-script [bnc#394431]: * check whether /tmp/VMwareDnD exists and create it if necessary * use modules vmblock, vmmemctl, vmsync for better performance * mount the virtual system for Drag'n'Drop +* Wed May 28 2008 dominique-rpm@leuenberger.net +- Excluded the building of KMPs for XEN, probably nobody installs + a vmware host in xen. * Thu May 22 2008 prusnak@suse.cz - added Recommends: open-vm-tools to KMP preamble [bnc#391434] - added -y to %%fillup_and_insserv macro, so the service starts automatically [bnc#391434] +* Tue May 20 2008 dominique-rpm@leuenberger.net +- replaced %%build section with the one from openSUSE internal + stable build, for building properly against all buildtargets +* Tue May 20 2008 dominique-rpm@leuenberger.net +- Added preamble for %%suse_kernel_module_package in order to have + a Recommends: open-vm-tools on the kmp. + The KMP is installed by Supplements: the hardware ID, and the KMP + then pulls in the open-vm-tools package by Recommends (if available) +* Wed May 07 2008 dominique-rpm@leuenberger.net +- Updated to 2008.05.15: + * Removed "blessed app" code for starting vmware-user + * lib/file/filePosix.c: Use new Posix_RealPath implementation. + * Cleanup UTF-8 handling. +- Added patch open-vm-tools-2008.05.02-str.c that should solve + compilation with FORTIFY_SOURCE enabled +* Tue May 06 2008 prusnak@suse.cz +- updated to 2008.05.02: + * continued Unicode support + * open-vm-tools now depends on libicu for codeset conversions + * a few more bug fixes * Mon Apr 28 2008 ro@suse.de - tweak build section long enough to really build modules matching to kernel flavour (and not just build all for -default) ++++++ open-vm-tools-2008.04.14-87182.tar.bz2 -> open-vm-tools-2008.09.03-114782.tar.bz2 ++++++ ++++ 317370 lines of diff (skipped) ++++++ open-vm-tools-2008.04.14-kver.patch -> open-vm-tools-2008.09.03-kver.patch ++++++ --- arch/i386/open-vm-tools/open-vm-tools-2008.04.14-kver.patch 2008-03-25 07:30:41.000000000 +0100 +++ open-vm-tools/open-vm-tools-2008.09.03-kver.patch 2008-09-03 21:17:07.000000000 +0200 @@ -72,4 +72,34 @@ +HEADER_DIR = /usr/src/linux-obj/$(VM_UNAME)/default/include BUILD_DIR = $(HEADER_DIR)/.. + +--- modules/linux/vmci/Makefile ++++ modules/linux/vmci/Makefile +@@ -26,10 +26,10 @@ + #### + SRCROOT = . + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(shell uname -i) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = /usr/src/linux-obj/$(VM_UNAME)/default/include + + BUILD_DIR = $(HEADER_DIR)/.. + +--- modules/linux/vsock/Makefile ++++ modules/linux/vsock/Makefile +@@ -26,10 +26,10 @@ + #### + SRCROOT = . + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(shell uname -i) + + # Header directory for the running kernel +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = /usr/src/linux-obj/$(VM_UNAME)/default/include + + BUILD_DIR = $(HEADER_DIR)/.. ++++++ vmware-guest ++++++ --- arch/i386/open-vm-tools/vmware-guest 2008-06-02 11:13:52.000000000 +0200 +++ open-vm-tools/vmware-guest 2008-07-30 15:12:09.000000000 +0200 @@ -1,18 +1,18 @@ #!/bin/sh # -# Template SUSE system startup script for vmware-guest service/daemon +# Template SUSE system startup script for vmware-guest service/daemon # Copyright (C) 2008 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 # the Free Software Foundation; either version 2.1 of the License, or (at # your option) any later version. -# +# # This library is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. -# +# # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org