From 83f92d13d0a4907ebc0ee9ed7b53ab637ba25acc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 16 Nov 2012 14:33:50 +0100 Subject: [PATCH] - updated to 9.2.2-893683 - removed obsolete patches --- open-vm-tools-kernel-3.2.patch | 50 ---------------------------------- open-vm-tools-kernel-3.3.patch | 18 ------------ open-vm-tools-kernel-3.4.patch | 45 ------------------------------ open-vm-tools.spec | 24 ++++++---------- 4 files changed, 8 insertions(+), 129 deletions(-) delete mode 100644 open-vm-tools-kernel-3.2.patch delete mode 100644 open-vm-tools-kernel-3.3.patch delete mode 100644 open-vm-tools-kernel-3.4.patch diff --git a/open-vm-tools-kernel-3.2.patch b/open-vm-tools-kernel-3.2.patch deleted file mode 100644 index c612f99..0000000 --- a/open-vm-tools-kernel-3.2.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c.orig 2012-03-16 01:46:19.000000000 +0100 -+++ open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c 2012-04-06 21:44:30.147182151 +0200 -@@ -1005,7 +1005,11 @@ - .ndo_start_xmit = &vmxnet_start_tx, - .ndo_stop = &vmxnet_close, - .ndo_get_stats = &vmxnet_get_stats, -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) -+ .ndo_set_rx_mode = &vmxnet_set_multicast_list, -+# else - .ndo_set_multicast_list = &vmxnet_set_multicast_list, -+# endif - .ndo_change_mtu = &vmxnet_change_mtu, - # ifdef VMW_HAVE_POLL_CONTROLLER - .ndo_poll_controller = vmxnet_netpoll, -@@ -2079,7 +2083,11 @@ - } else { - // map the part of the frag that is not copied - dma = pci_map_page(lp->pdev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) -+ frag->page.p, -+#else - frag->page, -+#endif - frag->page_offset + offset, - frag->size - offset, - PCI_DMA_TODEVICE); -@@ -2098,7 +2106,11 @@ - for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++) { - frag = &skb_shinfo(skb)->frags[nextFrag]; - dma = pci_map_page(lp->pdev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) -+ frag->page.p, -+#else - frag->page, -+#endif - frag->page_offset, - frag->size, - PCI_DMA_TODEVICE); -@@ -2596,7 +2608,11 @@ - } - - pci_unmap_page(pdev, rre2->paddr, PAGE_SIZE, PCI_DMA_FROMDEVICE); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) -+ skb_shinfo(skb)->frags[numFrags].page.p = lp->rxPages[dd->rxDriverNext2]; -+#else - skb_shinfo(skb)->frags[numFrags].page = lp->rxPages[dd->rxDriverNext2]; -+#endif - skb_shinfo(skb)->frags[numFrags].page_offset = 0; - skb_shinfo(skb)->frags[numFrags].size = rre2->actualLength; - skb->data_len += rre2->actualLength; diff --git a/open-vm-tools-kernel-3.3.patch b/open-vm-tools-kernel-3.3.patch deleted file mode 100644 index 1f21cc3..0000000 --- a/open-vm-tools-kernel-3.3.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c~ 2012-04-06 21:44:30.147182151 +0200 -+++ open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c 2012-04-06 22:20:15.724058800 +0200 -@@ -522,6 +522,7 @@ - .get_settings = vmxnet_get_settings, - .get_drvinfo = vmxnet_get_drvinfo, - .get_link = ethtool_op_get_link, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - .get_rx_csum = vmxnet_get_rx_csum, - .set_rx_csum = vmxnet_set_rx_csum, - .get_tx_csum = vmxnet_get_tx_csum, -@@ -535,6 +536,7 @@ - .get_ufo = ethtool_op_get_ufo, - # endif - #endif -+#endif - }; - - diff --git a/open-vm-tools-kernel-3.4.patch b/open-vm-tools-kernel-3.4.patch deleted file mode 100644 index da3cd0d..0000000 --- a/open-vm-tools-kernel-3.4.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- modules/linux/vmhgfs/filesystem.c.old 2012-06-08 11:46:42.000000000 +0000 -+++ modules/linux/vmhgfs/filesystem.c 2012-06-08 11:47:57.000000000 +0000 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include "compat_cred.h" - #include "compat_dcache.h" - #include "compat_fs.h" -@@ -375,8 +376,11 @@ - __func__)); - goto exit; - } -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) - tempRootDentry = d_alloc_root(rootInode); -+#else -+ tempRootDentry = d_make_root(rootInode); -+#endif - if (tempRootDentry == NULL) { - LOG(4, (KERN_WARNING "VMware hgfs: %s: Could not get " - "root dentry\n", __func__)); ---- modules/linux/vmblock/linux/filesystem.c.old 2012-06-08 11:48:17.000000000 +0000 -+++ modules/linux/vmblock/linux/filesystem.c 2012-06-08 11:49:05.000000000 +0000 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "compat_namei.h" - -@@ -525,7 +526,11 @@ - return -EINVAL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) - rootDentry = d_alloc_root(rootInode); -+#else -+ rootDentry = d_make_root(rootInode); -+#endif - if (!rootDentry) { - iput(rootInode); - return -ENOMEM; diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 637ab4c..d487ecf 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -6,9 +6,9 @@ %define snap 2011.10.26 %define subver %(echo %{snap} | tr -d .) -%define ver 8.8.2 -%define rev 590212 -%define rel 26 +%define ver 9.2.2 +%define rev 893683 +%define rel 1 %define pname open-vm-tools %define modsrc modules/linux Summary: VMWare guest utilities @@ -20,16 +20,13 @@ Release: %{rel} Epoch: 1 License: GPL Group: Applications/System -Source0: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-8.8.x/%{pname}-%{ver}-%{rev}.tar.gz -# Source0-md5: 601b97d54b72a601af102535a85026de +Source0: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.2.x/%{pname}-%{ver}-%{rev}.tar.gz +# Source0-md5: 7af505681d736d4c9ee6493b1166689f #Source0: http://downloads.sourceforge.net/open-vm-tools/open-vm-tools/%{snap}/%{pname}-%{snap}-%{rev}.tar.gz Source1: %{pname}-packaging Source2: %{pname}-modprobe.d Source3: %{pname}-init Source4: %{pname}-vmware-user.desktop -Patch0: %{pname}-kernel-3.2.patch -Patch1: %{pname}-kernel-3.3.patch -Patch2: %{pname}-kernel-3.4.patch URL: http://open-vm-tools.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.453 %if %{with userspace} @@ -46,7 +43,7 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: pam-devel BuildRequires: pkgconfig -BuildRequires: procps-devel +BuildRequires: procps-devel >= 1:3.3.3-2 BuildRequires: uriparser-devel BuildRequires: xorg-lib-libSM-devel BuildRequires: xorg-lib-libX11-devel @@ -223,9 +220,6 @@ Moduł jądra Linuksa VMware vsock. %prep #setup -q -n %{pname}-%{snap}-%{rev} %setup -q -n %{pname}-%{ver}-%{rev} -%patch0 -p1 -%patch1 -p1 -%patch2 -p0 cp %{SOURCE1} packaging %{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf @@ -244,6 +238,7 @@ export OVT_SOURCE_DIR=$PWD %if %{with userspace} rm -rf autom4te.cache %{__autoconf} +export CUSTOM_PROCPS_NAME=procps %configure2_13 \ --without-kernel-modules %{__make} \ @@ -316,7 +311,6 @@ fi %doc AUTHORS ChangeLog NEWS README packaging %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/vmtoolsd %dir /etc/vmware-tools -/etc/vmware-tools/plugins %attr(755,root,root) /etc/vmware-tools/*vm-* %attr(755,root,root) /etc/vmware-tools/statechange.subr %dir /etc/vmware-tools/scripts @@ -327,7 +321,6 @@ fi %attr(755,root,root) %{_bindir}/vmware-checkvm %attr(755,root,root) %{_bindir}/vmware-hgfsclient %attr(755,root,root) %{_bindir}/vmware-rpctool -%attr(755,root,root) %{_bindir}/vmware-toolbox %attr(755,root,root) %{_bindir}/vmware-toolbox-cmd %attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper %attr(755,root,root) %{_bindir}/vmware-xferlogs @@ -353,14 +346,13 @@ fi %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libdesktopEvents.so %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libdndcp.so %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libresolutionSet.so -%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libunity.so -%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libvixUser.so %attr(754,root,root) /etc/rc.d/init.d/%{pname} /etc/modprobe.d/%{pname}.conf %dir %{_datadir}/open-vm-tools %dir %{_datadir}/open-vm-tools/messages %lang(de) %{_datadir}/open-vm-tools/messages/de %lang(ja) %{_datadir}/open-vm-tools/messages/ja +%lang(ko) %{_datadir}/open-vm-tools/messages/ko %lang(zh_CN) %{_datadir}/open-vm-tools/messages/zh_CN %files devel -- 2.44.0