Date: Sun, 3 Aug 2008 13:58:30 GMT From: Olli Hauer <ohauer@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/126210: [patch] emulators/open-vm-tools pkg-plist and rc script Message-ID: <200808031358.m73DwUip015323@www.freebsd.org> Resent-Message-ID: <200808031400.m73E06IJ032079@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126210
>Category: ports
>Synopsis: [patch] emulators/open-vm-tools pkg-plist and rc script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 03 14:00:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
the port installes vmware-guestd twice, once in ${PREFIX}/sbin and once in ${PREFIX}/bin.
vmware-guestd is installed in ${PREFIX}/sbin by the port own makescript
<-- snip from make -vv package start -->
Making install in vmSignal
Making install in wiper
Making install in guestd
test -z "/usr/local/sbin" || .././install-sh -c -d "/usr/local/sbin"
/bin/sh ../libtool --mode=install install -s -o root -g wheel -m 555 'vmware- guestd' '/usr/local/sbin/vmware-guestd'
install -o root -g wheel -m 555 -s vmware-guestd /usr/local/sbin/vmware-guestd
<-- snip from make -vv package end -->
<-- snip line from port Makefile start -->
${INSTALL} ${WRKSRC}/guestd/vmware-guestd ${PREFIX}/bin/vmware-guestd
</-- snip line from port Makefile end -->
small correction to the rc script:
-checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null"
+checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null"
I have this checked only for open-vm-tools-nox11, since i have nowhere X installed
>How-To-Repeat:
Install port emulators/open-vm-tools-nox11
find /usr/local/ -name "vmw*"
=> two versions of vmware-guestd
deinstall the port
find /usr/local/ -name "vmw*"
/usr/local/sbin/vmware-guestd => since pkg-plist knows only the one in ${PREFIX}/bin
>Fix:
Patch attached with submission follows:
--- open-vm-tools/Makefile 2008-07-22 01:43:44.000000000 +0200
+++ open-vm-tools/Makefile 2008-08-03 15:30:03.000000000 +0200
@@ -69,7 +69,6 @@
${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/drivers
${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/input
${MKDIR} -p ${PREFIX}/share/vmware-tools
- ${INSTALL} ${WRKSRC}/guestd/vmware-guestd ${PREFIX}/bin/vmware-guestd
.if ${OSREL} >= 6
${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs
.endif
--- open-vm-tools/files/vmware-guestd.sh.in 2008-05-15 19:24:29.000000000 +0200
+++ open-vm-tools/files/vmware-guestd.sh.in 2008-08-03 15:21:05.000000000 +0200
@@ -11,7 +11,7 @@
. %%RC_SUBR%%
# Global
-checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null"
+checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null"
# VMware guest daemon
name="vmware_guestd"
--- open-vm-tools/pkg-plist 2008-07-27 15:57:54.000000000 +0200
+++ open-vm-tools/pkg-plist 2008-08-03 15:21:22.000000000 +0200
@@ -12,10 +12,10 @@
share/vmware-tools/resume-vm-default
share/vmware-tools/suspend-vm-default
share/vmware-tools/vm-support
-bin/vmware-guestd
bin/vmware-checkvm
bin/vmware-xferlogs
bin/vmware-hgfsclient
+sbin/vmware-guestd
etc/vmware-tools/tools.conf
%%FIVEONLY%%sbin/mount_vmhgfs
@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
--- open-vm-tools/pkg-plist-x11 2008-07-27 15:57:54.000000000 +0200
+++ open-vm-tools/pkg-plist-x11 2008-08-03 15:21:28.000000000 +0200
@@ -13,12 +13,12 @@
share/vmware-tools/suspend-vm-default
share/vmware-tools/vm-support
share/pixmaps/vmware/vmware-toolbox.xpm
-bin/vmware-guestd
bin/vmware-toolbox
bin/vmware-user
bin/vmware-checkvm
bin/vmware-xferlogs
bin/vmware-hgfsclient
+sbin/vmware-guestd
etc/vmware-tools/tools.conf
%%FIVEONLY%%sbin/mount_vmhgfs
%%X11%%sbin/vmware-toolbox
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808031358.m73DwUip015323>