Date: Fri, 16 Dec 2005 20:30:27 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90488: emulators/vmware-guestd5 vmware-tools5: move tools scripts to guestd port Message-ID: <20051216113028.01BC21145A@berkeley.l.sa2c.net> Resent-Message-ID: <200512161140.jBGBe20u051272@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90488
>Category: ports
>Synopsis: emulators/vmware-guestd5 vmware-tools5: move tools scripts to guestd port
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 16 11:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: NIIMI Satoshi
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.0-RELEASE FreeBSD 6.0-RELEASE #3: Tue Nov 8 17:05:21 JST 2005 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This PR moves VMware Tools' default script from vmware-tools5 to
vmware-guestd5, because VMware Player fails to suspend and warns on
poweron and resume without /etc/vmware-tools/*-default.
>How-To-Repeat:
Open .vmx file with VMware Player that comes with VMware Workstation 5.5.
>Fix:
--- vmware-guestd5.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile 8 Dec 2005 05:13:42 -0000 1.26
+++ Makefile 16 Dec 2005 11:21:18 -0000
@@ -7,7 +7,7 @@
PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= emulators
MASTER_SITES= # bundled with VMware Workstation
PKGNAMESUFFIX?= -guestd
@@ -207,12 +207,6 @@
.endif
.endif
-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
- ${MKDIR} ${PREFIX}/share/vmware-tools
- ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default
- ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default
- ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/resume-vm-default
- ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default
- ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
.else
@@ -240,6 +234,12 @@
${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
@${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
+ ${MKDIR} ${PREFIX}/share/vmware-tools
+ ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default
+ ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default
+ ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/resume-vm-default
+ ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default
+ ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
.endif
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 26 Nov 2005 09:19:58 -0000 1.6
+++ pkg-plist 16 Dec 2005 11:10:01 -0000
@@ -6,3 +6,10 @@
%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true
%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true
+share/vmware-tools/poweroff-vm-default
+share/vmware-tools/poweron-vm-default
+share/vmware-tools/resume-vm-default
+share/vmware-tools/suspend-vm-default
+@dirrm share/vmware-tools
+@cwd /
+etc/vmware-tools
Index: pkg-plist.tools
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/pkg-plist.tools,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist.tools
--- pkg-plist.tools 26 Nov 2005 09:19:58 -0000 1.4
+++ pkg-plist.tools 16 Dec 2005 11:10:02 -0000
@@ -6,10 +6,3 @@
%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
-share/vmware-tools/poweroff-vm-default
-share/vmware-tools/poweron-vm-default
-share/vmware-tools/resume-vm-default
-share/vmware-tools/suspend-vm-default
-@dirrm share/vmware-tools
-@cwd /
-etc/vmware-tools
--- vmware-guestd5.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051216113028.01BC21145A>