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.
This commit is contained in:
parent
1a5e8b8c13
commit
8e5e26ef0c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=128152
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user