From owner-freebsd-ports Thu May 25 5:47: 4 2000 Delivered-To: freebsd-ports@freebsd.org Received: from serio.al.rim.or.jp (serio.al.rim.or.jp [202.247.191.123]) by hub.freebsd.org (Postfix) with ESMTP id A0E8C37C077 for ; Thu, 25 May 2000 05:46:59 -0700 (PDT) (envelope-from inagaki@tg.rim.or.jp) Received: from mail1.rim.or.jp by serio.al.rim.or.jp (8.9.3/3.7W/HMX-12) id VAA23668; Thu, 25 May 2000 21:46:56 +0900 (JST) Received: from lunatic.kareidoscope.ne.jp (ngno005n046.ppp.infoweb.ne.jp [211.2.14.158]) by mail1.rim.or.jp (3.7W) id VAA10038; Thu, 25 May 2000 21:46:54 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by lunatic.kareidoscope.ne.jp (8.9.3/3.7W) with ESMTP id VAA14612; Thu, 25 May 2000 21:47:31 +0900 (JST) Date: Thu, 25 May 2000 21:47:31 +0900 (JST) Message-Id: <20000525.214731.59662955.inagaki@tg.rim.or.jp> To: knu@idaemons.org Cc: freebsd-ports@FreeBSD.ORG Subject: Re: ports/18799: vmware2 not works with 5.0-CURRENT (modules load problem) In-Reply-To: <200005250600.XAA74957@freefall.freebsd.org> References: <200005250600.XAA74957@freefall.freebsd.org> From: Kentaro Inagaki / =?iso-2022-jp?B?GyRCMHAzQBsoQiAbJEI3ckJATzobKEI=?= X-Mailer: Mew version 1.95b36 on Emacs 20.6 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Thu_May_25_21:47:31_2000_545)--" Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org ----Next_Part(Thu_May_25_21:47:31_2000_545)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi. I checked and tested your reports. And it is good. I made and tested a new patch. Please test it. If it is possible, please test it with 4.x. If it is no problem, please commit it. Date: Wed, 24 May 2000 23:00:03 -0700 (PDT) Message-ID: <200005250600.XAA74957@freefall.freebsd.org> > I think I'll do with this this weekend. I'm keeping in contact with > Inagaki-san, Peter and some other people to fix this situation. > Inagaki-san's patch still needs to fix in some respects (that I mailed > him), but almost good. ---- Kentaro Inagaki ----Next_Part(Thu_May_25_21:47:31_2000_545)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="vmware2.patch" diff -ruNx CVS /usr/ports/emulators/vmware2/Makefile vmware2/Makefile --- /usr/ports/emulators/vmware2/Makefile Sun Apr 30 13:01:20 2000 +++ vmware2/Makefile Thu May 11 23:08:02 2000 @@ -62,6 +62,7 @@ post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC} ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile + ${RM} -rf ${WRKSRC}/vmmon-only/linux/ setoptions: ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ diff -ruNx CVS /usr/ports/emulators/vmware2/patches/patch-ab vmware2/patches/patch-ab --- /usr/ports/emulators/vmware2/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ vmware2/patches/patch-ab Wed May 24 19:26:09 2000 @@ -0,0 +1,13 @@ +--- vmmon-only/freebsd/driver.c.orig Mon Jan 24 07:29:19 2000 ++++ vmmon-only/freebsd/driver.c Tue May 2 00:07:43 2000 +@@ -291,7 +291,10 @@ + return(err); + } + /* Now declare the module to the system */ ++#ifdef MODULE_DEPEND ++MODULE_DEPEND(vmmon, linux, 1, 1, 1); ++#endif + DEV_MODULE(vmmon, vmmon_modeevent, 0); + + /* + *---------------------------------------------------------------------- diff -ruNx CVS /usr/ports/emulators/vmware2/patches/patch-bb vmware2/patches/patch-bb --- /usr/ports/emulators/vmware2/patches/patch-bb Thu Jan 1 09:00:00 1970 +++ vmware2/patches/patch-bb Wed May 24 19:28:16 2000 @@ -0,0 +1,14 @@ +--- vmnet-only/freebsd/vmnet.c.orig Mon Jan 24 07:29:50 2000 ++++ vmnet-only/freebsd/vmnet.c Tue May 2 00:11:53 2000 +@@ -116,8 +116,11 @@ + * Now declare the module to the system. + * IMPORTANT: Must be before netgraph node declaration. + */ ++#ifdef MODULE_DEPEND ++MODULE_DEPEND(vmnet, linux, 1, 1, 1); ++#endif + DEV_MODULE(vmnet, vmnet_modeevent, 0); + + + static int vmnet_ifioctl(struct ifnet *, u_long, caddr_t); + static void vmnet_ifstart(struct ifnet *); ----Next_Part(Thu_May_25_21:47:31_2000_545)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="vmware2.patch2" diff -ruN vmware2.old/patches/patch-aa vmware2/patches/patch-aa --- vmware2.old/patches/patch-aa Thu Jan 1 09:00:00 1970 +++ vmware2/patches/patch-aa Thu May 25 21:22:57 2000 @@ -0,0 +1,12 @@ +--- vmmon-only/Makefile.FreeBSD.orig Mon Jan 24 07:29:11 2000 ++++ vmmon-only/Makefile.FreeBSD Tue May 2 00:03:04 2000 +@@ -39,6 +39,9 @@ + CDEV_MAJOR = 200 + SRCS= + ++# For 4.0-STABLE ++KMODDEPS= linux ++ + INCLUDE = -I$(.CURDIR)/include -I$(.CURDIR)/common -I$(.CURDIR)/freebsd -I$(.CURDIR)/export/include -I/sys + + CFLAGS+=${INCLUDE} -DCDEV_MAJOR_=${CDEV_MAJOR} ${SMP_FLAGS} diff -ruN vmware2.old/patches/patch-ba vmware2/patches/patch-ba --- vmware2.old/patches/patch-ba Thu Jan 1 09:00:00 1970 +++ vmware2/patches/patch-ba Thu May 25 21:22:57 2000 @@ -0,0 +1,11 @@ +--- vmnet-only/freebsd/Makefile.orig Sun Jan 23 04:30:50 2000 ++++ vmnet-only/freebsd/Makefile Tue May 2 00:10:20 2000 +@@ -34,6 +34,8 @@ + IFNET?= 192.168.254 + IFADDR?= ${IFNET}.1 + ++# For 4.0-STABLE ++KMODDEPS= linux + + INCLUDE = -I${.CURDIR} -I${SYS} + ----Next_Part(Thu_May_25_21:47:31_2000_545)---- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message