From 0bc2c4d60f3b14f1b8ef27e3556b80659398385f Mon Sep 17 00:00:00 2001 From: uebayasi Date: Wed, 2 Oct 2002 05:28:36 +0000 Subject: Deal with LKM incompatibility introduced by gehenna-devsw merge. Patch supplied by Maekawa-san as PR#18337. --- emulators/vmware-module/Makefile | 3 ++- emulators/vmware-module/distinfo | 10 +++++++--- emulators/vmware-module/patches/patch-ad | 22 +++++++++++++++++----- emulators/vmware-module/patches/patch-ae | 16 ++++++++++++++-- emulators/vmware-module/patches/patch-af | 15 +++++++++++++++ emulators/vmware-module/patches/patch-ag | 15 +++++++++++++++ emulators/vmware-module/patches/patch-ah | 15 +++++++++++++++ emulators/vmware-module/patches/patch-ai | 16 ++++++++++++++++ 8 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 emulators/vmware-module/patches/patch-af create mode 100644 emulators/vmware-module/patches/patch-ag create mode 100644 emulators/vmware-module/patches/patch-ah create mode 100644 emulators/vmware-module/patches/patch-ai (limited to 'emulators/vmware-module') diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile index 99cd1b726bb..7578e86e765 100644 --- a/emulators/vmware-module/Makefile +++ b/emulators/vmware-module/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/03/04 19:41:07 fredb Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/02 05:28:36 uebayasi Exp $ DISTNAME= vmware-netbsd-1.0 PKGNAME= vmware-module-1.0 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= # empty EXTRACT_SUFX= .tgz diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo index 47a3a78c329..48b26fcb543 100644 --- a/emulators/vmware-module/distinfo +++ b/emulators/vmware-module/distinfo @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.2 2001/08/10 23:17:22 kristerw Exp $ +$NetBSD: distinfo,v 1.3 2002/10/02 05:28:36 uebayasi Exp $ SHA1 (vmware-netbsd-1.0.tgz) = ea3ec59de0bab2ecd57aedbff0ade54f88f84ae2 Size (vmware-netbsd-1.0.tgz) = 93286 bytes SHA1 (patch-aa) = dc008ea571bb2fd15be77a3bd39bfdecf9f1f243 SHA1 (patch-ab) = 2ff6e47f7e57c56ac026749e579bf4ebe0d8ac6f SHA1 (patch-ac) = 528dab24b0daebb97fcfd911d9abe0c60804351a -SHA1 (patch-ad) = b04cb3a5422fbe5f97c9f5998272b9c7e2c64e47 -SHA1 (patch-ae) = 9f4025f006228505d14d241e2a89be291105e7f4 +SHA1 (patch-ad) = d027b3f5b9e25309ecac585d5b27c815a83ace86 +SHA1 (patch-ae) = ae83d79b8f2ad4f211e1d1fb26b05df6405f4e6a +SHA1 (patch-af) = f9a5d00028faa5d30a9a19cd92b18eb825327aeb +SHA1 (patch-ag) = 14dd7c64d9c0644f1173110b4330e39553ca806f +SHA1 (patch-ah) = 9c0fb3cefb0fc971b4eaeaf6a6ec2f458fe837f7 +SHA1 (patch-ai) = c3ef59e2c749d3eb910996eeae3c7785653a8f92 diff --git a/emulators/vmware-module/patches/patch-ad b/emulators/vmware-module/patches/patch-ad index 4b140e21d93..1089fbd7aa6 100644 --- a/emulators/vmware-module/patches/patch-ad +++ b/emulators/vmware-module/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw Exp $ +$NetBSD: patch-ad,v 1.3 2002/10/02 05:28:36 uebayasi Exp $ --- source/vmnet/if_hubvar.h Tue Apr 3 00:57:57 2001 +++ source/vmnet/if_hubvar.h Sun Jun 10 11:35:34 2001 @@ -14,7 +14,19 @@ $NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw Exp $ +#endif --- source/vmnet/if_hubmod.c Tue Apr 3 22:51:19 2001 +++ source/vmnet/if_hubmod.c Sat Jun 23 23:56:58 2001 -@@ -141,10 +141,19 @@ +@@ -128,7 +128,11 @@ + static struct hubdev_softc *hub_scs[MAXHUBDEVS]; + + ++#if __NetBSD_Version__ >= 106080000 ++MOD_DEV("vmnet", "vmnet", NULL, -1, &hub_dev, -1) ++#else + MOD_DEV("vmnet", LM_DT_CHAR, -1, &hub_dev) ++#endif + + int + if_hub_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) +@@ -141,10 +145,19 @@ { int error = 0, i, j; struct hubdev_softc *sc; @@ -34,7 +46,7 @@ $NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw Exp $ printf("if_hub: HUBMAXPKT > MCLBYTES\n"); return EIO; } -@@ -496,6 +505,11 @@ +@@ -496,6 +509,11 @@ fp->f_type = DTYPE_VNODE; fp->f_ops = &vnops; fp->f_data = (caddr_t)vp; @@ -46,7 +58,7 @@ $NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw Exp $ FILE_UNUSE(fp, p); p->p_dupfd = fd; -@@ -903,6 +917,9 @@ +@@ -903,6 +921,9 @@ struct hubport_softc *portsc; struct mbuf *m; int error; @@ -56,7 +68,7 @@ $NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw Exp $ hubsc = hub_scs[HUBUNIT(dev)]; if (hubsc == NULL) -@@ -917,7 +934,12 @@ +@@ -917,7 +938,12 @@ if (uio->uio_resid == 0) return (0); diff --git a/emulators/vmware-module/patches/patch-ae b/emulators/vmware-module/patches/patch-ae index 280ea575e27..688cf69645e 100644 --- a/emulators/vmware-module/patches/patch-ae +++ b/emulators/vmware-module/patches/patch-ae @@ -1,8 +1,20 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ +$NetBSD: patch-ae,v 1.2 2002/10/02 05:28:37 uebayasi Exp $ --- source/vmmon/netbsd/drv.c Tue Apr 3 00:41:32 2001 +++ source/vmmon/netbsd/drv.c Sat Jun 23 22:12:21 2001 -@@ -280,6 +280,11 @@ +@@ -121,7 +121,11 @@ + static int vmmon_debug = 0; + + ++#if __NetBSD_Version__ >= 106080000 ++MOD_DEV("vmmon", "vmmon", NULL, -1, &vmmon_dev, -1) ++#else + MOD_DEV("vmmon", LM_DT_CHAR, -1, &vmmon_dev) ++#endif + + int + vmmon_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) +@@ -280,6 +284,11 @@ fp->f_type = DTYPE_VNODE; fp->f_ops = &vnops; fp->f_data = (caddr_t)vp; diff --git a/emulators/vmware-module/patches/patch-af b/emulators/vmware-module/patches/patch-af new file mode 100644 index 00000000000..caf75b5e8e7 --- /dev/null +++ b/emulators/vmware-module/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 2002/10/02 05:28:37 uebayasi Exp $ + +--- share/lkm/if_hub_post.sh Thu Sep 19 23:47:10 2002 ++++ share/lkm/if_hub_post.sh Thu Sep 19 23:47:52 2002 +@@ -7,8 +7,8 @@ + # + # modload netbsd_post.sh if_hub.o + # +-if [ $# -ne 3 ]; then +- echo "$0 should only be called from modload(8) with 3 args" ++if [ $# -lt 3 ]; then ++ echo "$0: should be called by modload(8) with at least 3 arguments" + exit 1 + fi + diff --git a/emulators/vmware-module/patches/patch-ag b/emulators/vmware-module/patches/patch-ag new file mode 100644 index 00000000000..ec47df3cc28 --- /dev/null +++ b/emulators/vmware-module/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1 2002/10/02 05:28:37 uebayasi Exp $ + +--- share/lkm/linuxrtc_post.sh Thu Sep 19 23:47:16 2002 ++++ share/lkm/linuxrtc_post.sh Thu Sep 19 23:48:03 2002 +@@ -7,8 +7,8 @@ + # + # modload -e rtc_lkmentry -p rtc_post.sh linuxrtc.o + # +-if [ $# -ne 3 ]; then +- echo "$0 should only be called from modload(8) with 3 args" ++if [ $# -lt 3 ]; then ++ echo "$0: should be called by modload(8) with at least 3 arguments" + exit 1 + fi + diff --git a/emulators/vmware-module/patches/patch-ah b/emulators/vmware-module/patches/patch-ah new file mode 100644 index 00000000000..d8f6eb698a8 --- /dev/null +++ b/emulators/vmware-module/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1 2002/10/02 05:28:38 uebayasi Exp $ + +--- share/lkm/vmmon_post.sh Thu Sep 19 23:47:20 2002 ++++ share/lkm/vmmon_post.sh Thu Sep 19 23:48:17 2002 +@@ -7,8 +7,8 @@ + # + # modload -e vmmon_lkmentry -p vmmon_post.sh vmmon.o + # +-if [ $# -ne 3 ]; then +- echo "$0 should only be called from modload(8) with 3 args" ++if [ $# -lt 3 ]; then ++ echo "$0: should be called by modload(8) with at least 3 arguments" + exit 1 + fi + diff --git a/emulators/vmware-module/patches/patch-ai b/emulators/vmware-module/patches/patch-ai new file mode 100644 index 00000000000..e5aa1c9a4ec --- /dev/null +++ b/emulators/vmware-module/patches/patch-ai @@ -0,0 +1,16 @@ +$NetBSD: patch-ai,v 1.1 2002/10/02 05:28:38 uebayasi Exp $ + +--- source/linuxrtc/rtc.c Thu Sep 19 23:53:19 2002 ++++ source/linuxrtc/rtc.c Thu Sep 19 23:54:10 2002 +@@ -87,7 +87,11 @@ + }; + + ++#if __NetBSD_Version__ >= 106080000 ++MOD_DEV("linuxrtc", "linuxrtc", NULL, -1, &rtc_dev, -1) ++#else + MOD_DEV("linuxrtc", LM_DT_CHAR, -1, &rtc_dev) ++#endif + + int + rtc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) -- cgit v1.2.3