aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2005-02-06 22:04:38 +0800
committersobomax <sobomax@FreeBSD.org>2005-02-06 22:04:38 +0800
commitda095823c2e247f2fab7a374aaa4f76b077c1144 (patch)
treeed53243b63a106d225d78f7f9e1c17d68106d089 /emulators
parentd46c11610eef94ec4e966205a7c4e6271795b7b9 (diff)
downloadfreebsd-ports-gnome-da095823c2e247f2fab7a374aaa4f76b077c1144.tar.gz
freebsd-ports-gnome-da095823c2e247f2fab7a374aaa4f76b077c1144.tar.zst
freebsd-ports-gnome-da095823c2e247f2fab7a374aaa4f76b077c1144.zip
o Make sure that /etc/vmware-tools is created as symlink pointing out to
${PREFIX}/share/vmware-tools. And create three symlinks to true(1) there (poweroff-vm-default, poweron-vm-default, suspend-vm-default), which makes it possible to shutdown or reboot guest FreeBSD system cleanly at the request of the host. vmware-guestd expects those binaries/scripts to be present. o Use `shutdown -p now' instead of `shutdown -h now', which in the case of vmware allows to avoid spinning host CPU after shutdown. o Patch vmware-checkvm, so that it traps proper signal (SIGBUS not SIGSEGV). Apparently checkvm utility have not been tested on FreeBSD (apart from the fact that it compiles). Bump PORTREVISION.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vmware-guestd4/Makefile10
-rw-r--r--emulators/vmware-guestd4/files/vmware-guestd.sh2
-rw-r--r--emulators/vmware-guestd4/files/vmware-guestd.sh.in2
-rw-r--r--emulators/vmware-guestd4/pkg-plist6
-rw-r--r--emulators/vmware-guestd5/Makefile10
-rw-r--r--emulators/vmware-guestd5/files/vmware-guestd.sh2
-rw-r--r--emulators/vmware-guestd5/files/vmware-guestd.sh.in2
-rw-r--r--emulators/vmware-guestd5/pkg-plist6
-rw-r--r--emulators/vmware-guestd6/Makefile10
-rw-r--r--emulators/vmware-guestd6/files/vmware-guestd.sh2
-rw-r--r--emulators/vmware-guestd6/files/vmware-guestd.sh.in2
-rw-r--r--emulators/vmware-guestd6/pkg-plist6
12 files changed, 48 insertions, 12 deletions
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index 8f55d3514a9c..320d4f37a4f8 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= # bundled with VMware itself
PKGNAMESUFFIX?= -guestd
@@ -116,6 +116,8 @@ post-patch:
${REINPLACE_CMD} -e 's|vmmemctl1.o||' ${WRKDIR}/vmmemctl-only/Makefile
${ECHO_CMD} "OBJS+=vmmemctl1.o" >> ${WRKDIR}/vmmemctl-only/Makefile
.endif
+ ${REINPLACE_CMD} "`${PRINTF} 's|\0152\013\0350|\0152\\\n\0350|g'`" \
+ ${WRKSRC}/sbin/vmware-checkvm
.if defined(VMWARE_X_PORTS)
@@ -153,7 +155,11 @@ do-install:
${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
@${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
-
.endif
+ ${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/suspend-vm-default
+ ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
.include <bsd.port.post.mk>
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh b/emulators/vmware-guestd4/files/vmware-guestd.sh
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd4/pkg-plist b/emulators/vmware-guestd4/pkg-plist
index c27ee799e7d5..088fe9ab446d 100644
--- a/emulators/vmware-guestd4/pkg-plist
+++ b/emulators/vmware-guestd4/pkg-plist
@@ -4,3 +4,9 @@ etc/rc.d/vmware-guestd.sh
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true
%%VMWARE_VMMEMCTL:%%@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/suspend-vm-default
+@dirrm share/vmware-tools
+@cwd /
+etc/vmware-tools
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index 8f55d3514a9c..320d4f37a4f8 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= # bundled with VMware itself
PKGNAMESUFFIX?= -guestd
@@ -116,6 +116,8 @@ post-patch:
${REINPLACE_CMD} -e 's|vmmemctl1.o||' ${WRKDIR}/vmmemctl-only/Makefile
${ECHO_CMD} "OBJS+=vmmemctl1.o" >> ${WRKDIR}/vmmemctl-only/Makefile
.endif
+ ${REINPLACE_CMD} "`${PRINTF} 's|\0152\013\0350|\0152\\\n\0350|g'`" \
+ ${WRKSRC}/sbin/vmware-checkvm
.if defined(VMWARE_X_PORTS)
@@ -153,7 +155,11 @@ do-install:
${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
@${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
-
.endif
+ ${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/suspend-vm-default
+ ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
.include <bsd.port.post.mk>
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh b/emulators/vmware-guestd5/files/vmware-guestd.sh
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd5/pkg-plist b/emulators/vmware-guestd5/pkg-plist
index c27ee799e7d5..088fe9ab446d 100644
--- a/emulators/vmware-guestd5/pkg-plist
+++ b/emulators/vmware-guestd5/pkg-plist
@@ -4,3 +4,9 @@ etc/rc.d/vmware-guestd.sh
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true
%%VMWARE_VMMEMCTL:%%@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/suspend-vm-default
+@dirrm share/vmware-tools
+@cwd /
+etc/vmware-tools
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 8f55d3514a9c..320d4f37a4f8 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= # bundled with VMware itself
PKGNAMESUFFIX?= -guestd
@@ -116,6 +116,8 @@ post-patch:
${REINPLACE_CMD} -e 's|vmmemctl1.o||' ${WRKDIR}/vmmemctl-only/Makefile
${ECHO_CMD} "OBJS+=vmmemctl1.o" >> ${WRKDIR}/vmmemctl-only/Makefile
.endif
+ ${REINPLACE_CMD} "`${PRINTF} 's|\0152\013\0350|\0152\\\n\0350|g'`" \
+ ${WRKSRC}/sbin/vmware-checkvm
.if defined(VMWARE_X_PORTS)
@@ -153,7 +155,11 @@ do-install:
${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
@${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
-
.endif
+ ${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/suspend-vm-default
+ ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
.include <bsd.port.post.mk>
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh b/emulators/vmware-guestd6/files/vmware-guestd.sh
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
index 47ceb24b2c00..2bdeddcab5ac 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
@@ -41,7 +41,7 @@ unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
command="${PREFIX}/sbin/vmware-guestd"
-command_args=">/dev/null 2>&1"
+command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
load_rc_config $name
diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist
index c27ee799e7d5..088fe9ab446d 100644
--- a/emulators/vmware-guestd6/pkg-plist
+++ b/emulators/vmware-guestd6/pkg-plist
@@ -4,3 +4,9 @@ etc/rc.d/vmware-guestd.sh
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true
%%VMWARE_VMMEMCTL:%%@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/suspend-vm-default
+@dirrm share/vmware-tools
+@cwd /
+etc/vmware-tools