[arch-commits] Commit in open-vm-tools/trunk (5 files)
Balló György
bgyorgy at nymeria.archlinux.org
Fri Feb 21 12:07:45 UTC 2014
Date: Friday, February 21, 2014 @ 13:07:45
Author: bgyorgy
Revision: 106031
upgpkg: open-vm-tools 5:2013.09.16-6
Drop open-vm-tools-dkms due incompatibilty with recent kernels (FS#37026)
Modified:
open-vm-tools/trunk/PKGBUILD
Deleted:
open-vm-tools/trunk/dkms-conf.patch
open-vm-tools/trunk/modprobe.conf
open-vm-tools/trunk/open-vm-tools-dkms.install
open-vm-tools/trunk/open-vm-tools.install
----------------------------+
PKGBUILD | 46 ++++++++-----------------------------------
dkms-conf.patch | 15 --------------
modprobe.conf | 1
open-vm-tools-dkms.install | 22 --------------------
open-vm-tools.install | 10 ---------
5 files changed, 9 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-21 10:50:45 UTC (rev 106030)
+++ PKGBUILD 2014-02-21 12:07:45 UTC (rev 106031)
@@ -2,26 +2,23 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
# Contributor: Krzysztof Raczkowski <raczkow at gmail.com>
-pkgbase=open-vm-tools
-pkgname=('open-vm-tools' 'open-vm-tools-dkms')
+pkgname=open-vm-tools
epoch=5
pkgver=2013.09.16
_pkgsubver=1328054
-pkgrel=5
+pkgrel=6
pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
arch=('i686' 'x86_64')
url="http://open-vm-tools.sourceforge.net/"
license=('LGPL')
-depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss' 'iproute2')
-makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst')
-optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm'
- 'open-vm-tools-modules: for linux kernel'
- 'open-vm-tools-dkms: for linux-lts and other kernels'
+depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss' 'iproute2' 'fuse')
+makedepends=('chrpath' 'doxygen' 'gtkmm' 'libxtst')
+optdepends=('gtkmm: DnD/CP plugin'
+ 'libxtst: DnD/CP, resolution set plugins'
'netctl: suspend-resume network state'
'networkmanager: suspend-resume network state')
backup=('etc/pam.d/vmware-guestd')
options=('docs')
-install=$pkgname.install
#source=("http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/Development%20Snapshots/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz"
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz
network-script
@@ -28,23 +25,14 @@
tools.conf
vmware-guestd
xautostart.conf
- modprobe.conf
- vmtoolsd.service
- dkms-conf.patch)
+ vmtoolsd.service)
md5sums=('66c63d2d447b3a91303f996372ebda71'
'e307f5201b2b3fe79c9e2b410d02b989'
'b55d15e2c4be396aad709aeca91033d3'
'1b9ae908fce4c623269f100ee9bdfdef'
'75a25d83417e683957321f97a00f8465'
- 'bc5518489077e91655489bd04b868584'
- 'a6c53243d31c765580f6dded7d5fa98f'
- 'e00a4387c588eba4b37575e6dcd2f894')
+ 'a6c53243d31c765580f6dded7d5fa98f')
-prepare() {
- cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
- patch -p1 <$srcdir/dkms-conf.patch
-}
-
build() {
cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
export CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS ${CFLAGS}"
@@ -54,7 +42,7 @@
make
}
-package_open-vm-tools() {
+package() {
cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
make install DESTDIR="$pkgdir"
@@ -82,19 +70,3 @@
rm -f $pkgdir/etc/vmware-tools/scripts/vmware/*.orig
}
-
-package_open-vm-tools-dkms() {
- pkgdesc="kernel modules for the open source implementation of VMware Tools"
- depends=('dkms')
- provides=('open-vm-tools-modules')
- conflicts=('open-vm-tools-modules')
- optdepends=()
- backup=()
- install=open-vm-tools-dkms.install
-
- install -d -m755 ${pkgdir}/usr/src/
- sh ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/modules/linux/dkms.sh \
- ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/ \
- ${pkgdir}/usr/src/
- install -Dm644 ${srcdir}/modprobe.conf ${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf
-}
Deleted: dkms-conf.patch
===================================================================
--- dkms-conf.patch 2014-02-21 10:50:45 UTC (rev 106030)
+++ dkms-conf.patch 2014-02-21 12:07:45 UTC (rev 106031)
@@ -1,15 +0,0 @@
-diff -wbBur open-vm-tools-2013.09.16-1328054/modules/linux/dkms.conf open-vm-tools-2013.09.16-1328054.q/modules/linux/dkms.conf
---- open-vm-tools-2013.09.16-1328054/modules/linux/dkms.conf 2013-09-23 09:57:48.000000000 +0400
-+++ open-vm-tools-2013.09.16-1328054.q/modules/linux/dkms.conf 2013-12-02 14:38:38.385365105 +0400
-@@ -15,9 +15,9 @@
- CLEAN[0]="$MAKE_CMD_TMPL -C vmblock clean; \
- $MAKE_CMD_TMPL -C vmci clean; \
- $MAKE_CMD_TMPL -C vmhgfs clean; \
-- $MAKE_CMD_TMPL -C vmsync clean"; \
-+ $MAKE_CMD_TMPL -C vmsync clean; \
- $MAKE_CMD_TMPL -C vmxnet clean; \
-- $MAKE_CMD_TMPL -C vsock clean
-+ $MAKE_CMD_TMPL -C vsock clean"
- BUILT_MODULE_NAME[0]="vmblock"
- BUILT_MODULE_NAME[1]="vmci"
- BUILT_MODULE_NAME[2]="vmhgfs"
Deleted: modprobe.conf
===================================================================
--- modprobe.conf 2014-02-21 10:50:45 UTC (rev 106030)
+++ modprobe.conf 2014-02-21 12:07:45 UTC (rev 106031)
@@ -1 +0,0 @@
-softdep pcnet32 pre: vmxnet
Deleted: open-vm-tools-dkms.install
===================================================================
--- open-vm-tools-dkms.install 2014-02-21 10:50:45 UTC (rev 106030)
+++ open-vm-tools-dkms.install 2014-02-21 12:07:45 UTC (rev 106031)
@@ -1,22 +0,0 @@
-post_install() {
- post_upgrade ${@}
- echo ">>> Enabling vmxnet driver in /usr/lib/modprobe.d/open-vm-tools-modules.conf"
- echo ">>> (this will disable pcnet32 driver)"
- echo ">>>"
- echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually"
- echo ">>> disable loading of pcnet32 driver"
- echo ">>>"
-}
-
-post_upgrade() {
- VERSION="$(cut -d- -f1 <<<${1} | cut -d: -f2)"
- echo ">>> Enable building of open-vm-tools modules:"
- echo ">>> $ dkms add open-vm-tools/${VERSION}"
- echo ">>>"
-}
-
-post_remove() {
- echo ">>>"
- echo ">>> Remember to un-blacklist pcnet32 driver"
- echo ">>>"
-}
Deleted: open-vm-tools.install
===================================================================
--- open-vm-tools.install 2014-02-21 10:50:45 UTC (rev 106030)
+++ open-vm-tools.install 2014-02-21 12:07:45 UTC (rev 106031)
@@ -1,10 +0,0 @@
-post_install() {
- [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs
- echo ">>>"
- echo ">>> You can mount VMware Shared Folders via:"
- echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs"
- echo ">>>"
- echo ">>> or by adding this line to /etc/fstab:"
- echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0"
- echo ">>>"
-}
More information about the arch-commits
mailing list