From e92c6bf05abcbe62700d8d20d170bb2c5fb29f9e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 14 Feb 2017 01:26:07 +0100
Subject: main/open-vm-tools: fix few issues, move vmware-vmblock-fuse to -gtk

---
 main/open-vm-tools/APKBUILD | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'main/open-vm-tools')

diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index f1f61cd1d4..db3d6efede 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -3,7 +3,7 @@ pkgname=open-vm-tools
 pkgver=10.1.0
 _pkgsubver=${pkgver#*_p}
 _ver=${pkgver/_p/-}
-pkgrel=3
+pkgrel=4
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="https://github.com/vmware/open-vm-tools/"
 arch="x86 x86_64"
@@ -65,15 +65,20 @@ build() {
 package() {
 	cd "$builddir"/open-vm-tools
 
-	make install DESTDIR=$pkgdir || return 1
+	make install DESTDIR="$pkgdir" || return 1
+
+	cd "$pkgdir"
+
+	chmod -x ./etc/vmware-tools/*.conf
+	mv ./etc/vmware-tools/vm-support ./usr/bin/vm-support || return 1
 
 	install -Dm755 "$srcdir"/open-vm-tools.initd \
-		"$pkgdir"/etc/init.d/open-vm-tools || return 1
+		./etc/init.d/open-vm-tools || return 1
 	install -Dm755 "$srcdir"/open-vm-tools.confd \
-		"$pkgdir"/etc/conf.d/open-vm-tools || return 1
+		./etc/conf.d/open-vm-tools || return 1
 
-	mkdir -p "$pkgdir"/etc/modules-load.d/
-	cat > "$pkgdir"/etc/modules-load.d/open-vm-tools <<-EOF
+	mkdir -p ./etc/modules-load.d/
+	cat > ./etc/modules-load.d/open-vm-tools <<-EOF
 		vmblock
 		vmci
 		vmhgfs
@@ -92,6 +97,7 @@ gtk() {
 		"$subpkgdir"/etc/
 
 	mv "$pkgdir"/usr/bin/vmware-user-suid-wrapper \
+		"$pkgdir"/usr/bin/vmware-vmblock-fuse \
 		"$subpkgdir"/usr/bin/ || return 1
 	mv "$pkgdir"/etc/xdg "$subpkgdir"/etc/ || return 1
 	mv "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr \
-- 
cgit v1.2.3