summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/vmware2/Makefile4
-rw-r--r--emulators/vmware2/files/filedesc.patch32
-rw-r--r--emulators/vmware2/files/m_waitok.patch25
-rw-r--r--emulators/vmware3/Makefile4
-rw-r--r--emulators/vmware3/files/filedesc.patch32
-rw-r--r--emulators/vmware3/files/m_waitok.patch25
6 files changed, 122 insertions, 0 deletions
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index 1547672..eac87f1 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -113,6 +113,10 @@ post-patch:
.if ${OSVERSION} >= 500038
cat ${FILESDIR}/fo_ioctl.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
.endif
+.if ${OSVERSION} >= 500100
+ cat ${FILESDIR}/filedesc.patch | (cd ${WRKSRC} && patch)
+ cat ${FILESDIR}/m_waitok.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
+.endif
setoptions:
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
diff --git a/emulators/vmware2/files/filedesc.patch b/emulators/vmware2/files/filedesc.patch
new file mode 100644
index 0000000..8c62591
--- /dev/null
+++ b/emulators/vmware2/files/filedesc.patch
@@ -0,0 +1,32 @@
+--- vmnet-only/freebsd/vmnet_linux.c.orig Tue Feb 11 22:12:40 2003
++++ vmnet-only/freebsd/vmnet_linux.c Tue Feb 11 22:25:20 2003
+@@ -32,6 +32,7 @@
+ #include <sys/socket.h>
+ #include <sys/proc.h>
+ #include <sys/file.h>
++#include <sys/filedesc.h>
+
+ #include <net/if.h>
+
+--- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
++++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
+@@ -45,8 +45,9 @@
+ #include <sys/kernel.h>
+ #include <sys/module.h>
+ #include <sys/conf.h>
+ #include <sys/selinfo.h>
+ #include <sys/fcntl.h>
++#include <sys/filedesc.h>
+ #include <sys/malloc.h>
+ #include <sys/proc.h>
+ #include <sys/ioccom.h>
+--- vmmon-only/freebsd/linux_emu.c.orig Tue Feb 11 22:12:40 2003
++++ vmmon-only/freebsd/linux_emu.c Tue Feb 11 22:24:42 2003
+@@ -36,6 +36,7 @@
+ #include <sys/disklabel.h>
+ #include <sys/cdio.h>
+ #include <sys/file.h>
++#include <sys/filedesc.h>
+ #include <sys/selinfo.h>
+
+ #include <sys/fdcio.h>
diff --git a/emulators/vmware2/files/m_waitok.patch b/emulators/vmware2/files/m_waitok.patch
new file mode 100644
index 0000000..3c234ed
--- /dev/null
+++ b/emulators/vmware2/files/m_waitok.patch
@@ -0,0 +1,25 @@
+--- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
++++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
+@@ -91,6 +92,10 @@
+ typedef void driver_intr_t(void*);
+ #endif
+
++#ifndef M_WAITOK
++#define M_WAITOK 0x0000
++#endif
++
+ #ifdef SUPPORT_PASSTHROUGH
+ #include "passthrough.h" // _driver_ version of passthrough.h
+ #endif
+--- vmmon-only/freebsd/hostif.c.orig Tue Feb 11 22:12:40 2003
++++ vmmon-only/freebsd/hostif.c Tue Feb 11 22:22:15 2003
+@@ -100,6 +100,9 @@
+
+ #define HOST_ISTRACKED_PFN(_vm, _pfn, _vpn) (PhysTrack_Test(_vm->physTracker, _pfn))
+
++#ifndef M_WAITOK
++#define M_WAITOK 0x0000
++#endif
+
+ static
+ int host_lock_ppn(PPN ppn)
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 1547672..eac87f1 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -113,6 +113,10 @@ post-patch:
.if ${OSVERSION} >= 500038
cat ${FILESDIR}/fo_ioctl.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
.endif
+.if ${OSVERSION} >= 500100
+ cat ${FILESDIR}/filedesc.patch | (cd ${WRKSRC} && patch)
+ cat ${FILESDIR}/m_waitok.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
+.endif
setoptions:
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
diff --git a/emulators/vmware3/files/filedesc.patch b/emulators/vmware3/files/filedesc.patch
new file mode 100644
index 0000000..8c62591
--- /dev/null
+++ b/emulators/vmware3/files/filedesc.patch
@@ -0,0 +1,32 @@
+--- vmnet-only/freebsd/vmnet_linux.c.orig Tue Feb 11 22:12:40 2003
++++ vmnet-only/freebsd/vmnet_linux.c Tue Feb 11 22:25:20 2003
+@@ -32,6 +32,7 @@
+ #include <sys/socket.h>
+ #include <sys/proc.h>
+ #include <sys/file.h>
++#include <sys/filedesc.h>
+
+ #include <net/if.h>
+
+--- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
++++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
+@@ -45,8 +45,9 @@
+ #include <sys/kernel.h>
+ #include <sys/module.h>
+ #include <sys/conf.h>
+ #include <sys/selinfo.h>
+ #include <sys/fcntl.h>
++#include <sys/filedesc.h>
+ #include <sys/malloc.h>
+ #include <sys/proc.h>
+ #include <sys/ioccom.h>
+--- vmmon-only/freebsd/linux_emu.c.orig Tue Feb 11 22:12:40 2003
++++ vmmon-only/freebsd/linux_emu.c Tue Feb 11 22:24:42 2003
+@@ -36,6 +36,7 @@
+ #include <sys/disklabel.h>
+ #include <sys/cdio.h>
+ #include <sys/file.h>
++#include <sys/filedesc.h>
+ #include <sys/selinfo.h>
+
+ #include <sys/fdcio.h>
diff --git a/emulators/vmware3/files/m_waitok.patch b/emulators/vmware3/files/m_waitok.patch
new file mode 100644
index 0000000..3c234ed
--- /dev/null
+++ b/emulators/vmware3/files/m_waitok.patch
@@ -0,0 +1,25 @@
+--- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
++++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
+@@ -91,6 +92,10 @@
+ typedef void driver_intr_t(void*);
+ #endif
+
++#ifndef M_WAITOK
++#define M_WAITOK 0x0000
++#endif
++
+ #ifdef SUPPORT_PASSTHROUGH
+ #include "passthrough.h" // _driver_ version of passthrough.h
+ #endif
+--- vmmon-only/freebsd/hostif.c.orig Tue Feb 11 22:12:40 2003
++++ vmmon-only/freebsd/hostif.c Tue Feb 11 22:22:15 2003
+@@ -100,6 +100,9 @@
+
+ #define HOST_ISTRACKED_PFN(_vm, _pfn, _vpn) (PhysTrack_Test(_vm->physTracker, _pfn))
+
++#ifndef M_WAITOK
++#define M_WAITOK 0x0000
++#endif
+
+ static
+ int host_lock_ppn(PPN ppn)
OpenPOWER on IntegriCloud