Date: Sun, 15 Jan 2012 07:18:53 -0500 From: Michael Scheidell <scheidell@freebsd.org> To: Steve Wills <swills@FreeBSD.org> Cc: ohauer@FreeBSD.org, Edwin Groothuis <edwin@FreeBSD.org>, Gabor Kovesdan <gabor@FreeBSD.org>, cvs-ports@FreeBSD.org Subject: Re: cvs commit: ports/emulators/open-vm-tools Makefile distinfo pkg-plist Message-ID: <4F12C42D.5010308@freebsd.org> In-Reply-To: <4F09CB1F.8090103@FreeBSD.org> References: <201201080120.q081Kdq3018820@repoman.freebsd.org> <4F08FDB1.7000607@FreeBSD.org> <4F0981A1.4030708@freebsd.org> <4F09841D.6070701@FreeBSD.org> <4F09865C.5040905@freebsd.org> <4F09CB1F.8090103@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1/8/12 11:58 AM, Steve Wills wrote:
> I've attached the updated patch which lets the vmhgfs.ko module build
> in a way that allows it to at least kldload properly. But note that
> this module produces an instant panic on trying to mount an hgfs. If
> we think we can find a solution quickly, then perhaps for now include
> the updated patch, but don't install the hgfs module, so that the port
> loses the hgfs feature, but hopefully only temporarily.
>
adding this to port.
Index: patch-vmhgfs-Makefile
===================================================================
RCS file:
/home/pcvs/ports/emulators/open-vm-tools/files/patch-vmhgfs-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-vmhgfs-Makefile
--- patch-vmhgfs-Makefile 15 Nov 2010 23:59:05 -0000 1.1
+++ patch-vmhgfs-Makefile 15 Jan 2012 12:14:33 -0000
@@ -1,6 +1,15 @@
---- ./modules/freebsd/vmhgfs/Makefile.orig 2010-10-20
05:19:54.000000000 +0900
-+++ ./modules/freebsd/vmhgfs/Makefile 2010-11-11 23:06:07.000000000
+0900
-@@ -90,22 +90,7 @@
+--- modules/freebsd/vmhgfs/Makefile.orig 2011-09-15
02:03:28.000000000 +0000
++++ modules/freebsd/vmhgfs/Makefile 2012-01-08 16:11:28.000000000 +0000
+@@ -47,7 +47,7 @@
+ .endif
+
+ COMMON_HGFS_SRCS := debug.c
+-COMMON_HGFS_SRCS := bdhandler.c
++COMMON_HGFS_SRCS += bdhandler.c
+ COMMON_HGFS_SRCS += request.c
+ COMMON_HGFS_SRCS += worker.c
+ COMMON_HGFS_SRCS += fsutil.c
+@@ -93,22 +93,7 @@
CFLAGS += -Ishared
.endif
@@ -24,3 +33,4 @@
+.include <bsd.own.mk>
.include <bsd.kmod.mk>
+
and this
pcvs diff pkg-plist
socket: Protocol not supported
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/pkg-plist,v
retrieving revision 1.28
diff -u -r1.28 pkg-plist
--- pkg-plist 8 Jan 2012 01:20:39 -0000 1.28
+++ pkg-plist 15 Jan 2012 12:18:14 -0000
@@ -59,7 +59,7 @@
@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints;
then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
@unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f
%D/share/vmware-tools/tools.conf; fi
@unexec if test -h %D/etc/vmware-tools/plugins; then rm -f
%D/etc/vmware-tools/plugins; fi
-etc/xdg/autostart/vmware-user.desktop
+%%X11%%etc/xdg/autostart/vmware-user.desktop
@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg
@dirrmtry lib/vmware-tools/modules/drivers
to make PH happy.
<http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/a.7.20120112123332/open-vm-tools-nox11-471268.log>;
--
Michael Scheidell, CTO
o: 561-999-5000
d: 561-948-2259
>*| *SECNAP Network Security Corporation
* Best Mobile Solutions Product of 2011
* Best Intrusion Prevention Product
* Hot Company Finalist 2011
* Best Email Security Product
* Certified SNORT Integrator
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F12C42D.5010308>