diff options
author | bad <bad> | 2003-02-16 02:35:56 +0000 |
---|---|---|
committer | bad <bad> | 2003-02-16 02:35:56 +0000 |
commit | 28cf634226fbb67960c3db4d701203c0481be5fa (patch) | |
tree | fd8e337e0ab0a2463b78e2e1ea3900d01fc4040a /emulators/vmware-module | |
parent | 8f9b758a26976a4903e738d94196fcf855281a47 (diff) | |
download | pkgsrc-28cf634226fbb67960c3db4d701203c0481be5fa.tar.gz |
Update to netbsd-vmware-1.1 following the import into othersrc.
Diffstat (limited to 'emulators/vmware-module')
-rw-r--r-- | emulators/vmware-module/Makefile | 9 | ||||
-rw-r--r-- | emulators/vmware-module/distinfo | 17 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-aa | 31 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ab | 42 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ac | 38 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ad | 83 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ae | 28 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-af | 15 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ag | 15 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ah | 15 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-ai | 16 | ||||
-rw-r--r-- | emulators/vmware-module/patches/patch-aj | 14 |
12 files changed, 12 insertions, 311 deletions
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile index 7d3426aa76c..63a288351c7 100644 --- a/emulators/vmware-module/Makefile +++ b/emulators/vmware-module/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2003/01/23 14:32:58 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/02/16 02:35:56 bad Exp $ -DISTNAME= vmware-netbsd-1.0 -PKGNAME= vmware-module-1.0 -PKGREVISION= 1 +DISTNAME= vmware-netbsd-1.1 +PKGNAME= vmware-module-1.1 CATEGORIES= emulators -MASTER_SITES= # on ftp.netbsd.org and mirrors only +MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/vmware/ EXTRACT_SUFX= .tgz MAINTAINER= veego@netbsd.org diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo index d5275caa169..7d1730f9b3f 100644 --- a/emulators/vmware-module/distinfo +++ b/emulators/vmware-module/distinfo @@ -1,14 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/11/06 00:13:17 wiz Exp $ +$NetBSD: distinfo,v 1.5 2003/02/16 02:35:56 bad 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) = d027b3f5b9e25309ecac585d5b27c815a83ace86 -SHA1 (patch-ae) = ae83d79b8f2ad4f211e1d1fb26b05df6405f4e6a -SHA1 (patch-af) = f9a5d00028faa5d30a9a19cd92b18eb825327aeb -SHA1 (patch-ag) = 14dd7c64d9c0644f1173110b4330e39553ca806f -SHA1 (patch-ah) = 9c0fb3cefb0fc971b4eaeaf6a6ec2f458fe837f7 -SHA1 (patch-ai) = c3ef59e2c749d3eb910996eeae3c7785653a8f92 -SHA1 (patch-aj) = 7f5a85570e6527d95eb06697831ced8db70c1ca1 +SHA1 (vmware-netbsd-1.1.tgz) = 0910ba59da0a9e436d0bf7f6266ee93e174a34f3 +Size (vmware-netbsd-1.1.tgz) = 94045 bytes +SHA1 (patch-ab) = 19ff0b151b62870835a2b87e69a52b1cb3d95045 diff --git a/emulators/vmware-module/patches/patch-aa b/emulators/vmware-module/patches/patch-aa deleted file mode 100644 index fa3b16b1e99..00000000000 --- a/emulators/vmware-module/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ - ---- source/linuxrtc/Makefile Tue Apr 3 02:03:20 2001 -+++ source/linuxrtc/Makefile Sun Jun 10 10:14:02 2001 -@@ -1,5 +1,5 @@ - #S?= /work/trees/current/sys --S?= /work/trees/netbsd-1-5/sys -+S?= ${BSDSRCDIR}/sys - MKMAN= no - KMOD?= linuxrtc - SRCS= rtc.c ---- source/vmmon/Makefile Tue Apr 3 01:05:04 2001 -+++ source/vmmon/Makefile Sun May 13 22:02:16 2001 -@@ -1,7 +1,7 @@ - MKMAN= no - KMOD= vmmon - #S= /work/trees/current/sys --S= /work/trees/netbsd-1-5/sys -+S?= ${BSDSRCDIR}/sys - SRCS= - WARNS?= 1 - ---- source/vmnet/Makefile Tue Apr 3 00:54:50 2001 -+++ source/vmnet/Makefile Sun May 13 22:02:52 2001 -@@ -1,5 +1,5 @@ - #S?= /work/trees/current/sys --S?= /work/trees/netbsd-1-5/sys -+S?= ${BSDSRCDIR}/sys - MKMAN= no - KMOD?= if_hub - SRCS= if_hubmod.c diff --git a/emulators/vmware-module/patches/patch-ab b/emulators/vmware-module/patches/patch-ab index 16d3840f2d5..94fc9949224 100644 --- a/emulators/vmware-module/patches/patch-ab +++ b/emulators/vmware-module/patches/patch-ab @@ -1,16 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/16 02:35:56 bad Exp $ --- rc.d/linuxrtc Wed Apr 4 04:43:17 2001 +++ rc.d/linuxrtc Sun Jun 10 13:55:56 2001 -@@ -2,6 +2,7 @@ - # - - # PROVIDE: linuxrtc -+# BEFORE: securelevel - - . /etc/rc.subr - -@@ -13,8 +14,8 @@ +@@ -13,8 +17,8 @@ load_rc_config $name @@ -23,15 +15,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ { --- rc.d/vmmon Wed Apr 4 04:42:40 2001 +++ rc.d/vmmon Sun Jun 10 13:56:04 2001 -@@ -2,6 +2,7 @@ - # - - # PROVIDE: vmmon -+# BEFORE: securelevel - - . /etc/rc.subr - -@@ -13,8 +14,8 @@ +@@ -13,8 +13,8 @@ load_rc_config $name @@ -44,15 +28,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ { --- rc.d/vmnet Wed Apr 4 04:42:40 2001 +++ rc.d/vmnet Sun Jun 10 13:56:12 2001 -@@ -2,6 +2,7 @@ - # - - # PROVIDE: vmnet -+# BEFORE: securelevel - - . /etc/rc.subr - -@@ -13,8 +14,8 @@ +@@ -13,8 +13,8 @@ load_rc_config $name @@ -63,13 +39,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ vmnet_prestart() { ---- rc.d/vmnetif Wed Apr 4 04:43:19 2001 -+++ rc.d/vmnetif Sun Jun 10 13:37:57 2001 -@@ -2,6 +2,7 @@ - - # PROVIDE: vmnet-netifup - # REQUIRE: vmmon vmnet -+# BEFORE: securelevel - - . /etc/rc.subr - diff --git a/emulators/vmware-module/patches/patch-ac b/emulators/vmware-module/patches/patch-ac deleted file mode 100644 index 3662b1a54af..00000000000 --- a/emulators/vmware-module/patches/patch-ac +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ - ---- source/vmmon/netbsd/host.c Tue Apr 3 14:23:08 2001 -+++ source/vmmon/netbsd/host.c Thu Jun 28 21:52:09 2001 -@@ -315,9 +315,16 @@ - - /* - * now locate it and write the results back to the pmap -+ * -+ * Under extreme memory pressure, the page may be gone again. -+ * Just fail the lock in that case. -+ * (It was ASSERT_BUG(6339, mpn).) -+ * -- edward - */ - mpn = FindMPN(vpn); -- ASSERT(mpn); -+ if (mpn == 0) { -+ return 0; -+ } - - /* - * XXX SMP. -@@ -628,6 +635,7 @@ - if (vm->crossvaddr != NULL) - Warning("KernelAddr already allocated\n"); - -+ PHOLD(curproc); - uvm_vslock(curproc, addr, PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); - -@@ -636,6 +644,7 @@ - pmap_extract(vm_map_pmap(&curproc->p_vmspace->vm_map), uaddr, &paddr); - pmap_kenter_pa(kvaddr, paddr, - VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE); -+ PRELE(curproc); - vm->crossvaddr = (void *)kvaddr; - vm->crossuaddr = addr; - #ifdef DEBUG diff --git a/emulators/vmware-module/patches/patch-ad b/emulators/vmware-module/patches/patch-ad deleted file mode 100644 index 1089fbd7aa6..00000000000 --- a/emulators/vmware-module/patches/patch-ad +++ /dev/null @@ -1,83 +0,0 @@ -$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 -@@ -76,4 +76,8 @@ - #define MAKEHUBDEV(d,u) MAKEPORTDEV(d,0,-1) - - #define HUBMINPKT ETHER_HDR_LEN --#define HUBMAXPKT (ETHER_MAX_FRAME(ETHERTYPE_VLAN, 1)) -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+# define HUBMAXPKT(ifp) (ETHER_MAX_FRAME(ifp, ETHERTYPE_VLAN, 1)) -+#else -+# define HUBMAXPKT (ETHER_MAX_FRAME(ETHERTYPE_VLAN, 1)) -+#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 -@@ -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; -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+ struct ifnet *ifp; -+#endif - - switch (cmd) { - case LKM_E_LOAD: -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+ ifp = (struct ifnet *)malloc(sizeof(*ifp), M_MRTABLE, M_WAITOK); -+ ifp->if_mtu = ETHERMTU; -+ if (HUBMAXPKT(ifp) > MCLBYTES) { -+#else - if (HUBMAXPKT > MCLBYTES) { -+#endif - printf("if_hub: HUBMAXPKT > MCLBYTES\n"); - return EIO; - } -@@ -496,6 +509,11 @@ - fp->f_type = DTYPE_VNODE; - fp->f_ops = &vnops; - fp->f_data = (caddr_t)vp; -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+#ifdef FILE_SET_MATURE -+ FILE_SET_MATURE(fp); -+#endif -+#endif - FILE_UNUSE(fp, p); - - p->p_dupfd = fd; -@@ -903,6 +921,9 @@ - struct hubport_softc *portsc; - struct mbuf *m; - int error; -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+ struct ifnet *ifp; -+#endif - - hubsc = hub_scs[HUBUNIT(dev)]; - if (hubsc == NULL) -@@ -917,7 +938,12 @@ - if (uio->uio_resid == 0) - return (0); - -+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) -+ ifp = &portsc->port_if; -+ if ((uio->uio_resid < HUBMINPKT) || (uio->uio_resid > HUBMAXPKT(ifp))) { -+#else - if ((uio->uio_resid < HUBMINPKT) || (uio->uio_resid > HUBMAXPKT)) { -+#endif - HUBDEBUG("if_hub: write: illegal length %d\n", uio->uio_resid); - return EIO; - } diff --git a/emulators/vmware-module/patches/patch-ae b/emulators/vmware-module/patches/patch-ae deleted file mode 100644 index 688cf69645e..00000000000 --- a/emulators/vmware-module/patches/patch-ae +++ /dev/null @@ -1,28 +0,0 @@ -$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 -@@ -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; -+#if __NetBSD_Version__ >= 105230000 -+#ifdef FILE_SET_MATURE -+ FILE_SET_MATURE(fp); -+#endif -+#endif - FILE_UNUSE(fp, p); - - p->p_dupfd = fd; diff --git a/emulators/vmware-module/patches/patch-af b/emulators/vmware-module/patches/patch-af deleted file mode 100644 index caf75b5e8e7..00000000000 --- a/emulators/vmware-module/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index ec47df3cc28..00000000000 --- a/emulators/vmware-module/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index d8f6eb698a8..00000000000 --- a/emulators/vmware-module/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index e5aa1c9a4ec..00000000000 --- a/emulators/vmware-module/patches/patch-ai +++ /dev/null @@ -1,16 +0,0 @@ -$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) diff --git a/emulators/vmware-module/patches/patch-aj b/emulators/vmware-module/patches/patch-aj deleted file mode 100644 index fcef97d65bf..00000000000 --- a/emulators/vmware-module/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2002/11/06 00:13:16 wiz Exp $ - ---- source/vmmon/include/x86.h.orig Thu Nov 30 13:37:01 2000 -+++ source/vmmon/include/x86.h -@@ -176,7 +176,9 @@ - #define CPUID_FAMILY_P5 5 - #define CPUID_FAMILY_P6 6 - -+#ifndef MSR_TSC - #define MSR_TSC 0x00000010 -+#endif /* MSR_TSC */ - #define MSR_MTRR_CAP 0x000000fe - #define MSR_SYSENTER_CS 0x00000174 - #define MSR_SYSENTER_ESP 0x00000175 |