- Fix loading of vboxnetadp.ko kernel module without loading vboxnetflt.ko

kernel module first.
- Bump PORTREVISION.

PR:			ports/141013
Reported / tested by:	Scot Hetzel <swhetzel AT gmail.com>
Submitted by:		Fredrik Lindberg <fli AT shapeshifter.se>
This commit is contained in:
Beat Gaetzi 2009-12-09 12:31:45 +00:00
parent 5e0299deef
commit 5909b90a90
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=245451
15 changed files with 105 additions and 5 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= virtualbox PORTNAME= virtualbox
DISTVERSION= 3.0.51r22902 DISTVERSION= 3.0.51r22902
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \ MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \ http://freebsd.unixfreunde.de/sources/ \

View file

@ -0,0 +1,11 @@
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100
@@ -92,7 +92,7 @@
DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(vboxnetadp, 1);
MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1);
-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1);
+MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1);
/**
* Module event handler

View file

@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
.rcvmsg = ng_vboxnetflt_rcvmsg, .rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown, .shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook, .newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@ @@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{ {

View file

@ -7,7 +7,7 @@
PORTNAME= virtualbox PORTNAME= virtualbox
DISTVERSION= 3.0.51r22902 DISTVERSION= 3.0.51r22902
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \ MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \ http://freebsd.unixfreunde.de/sources/ \

View file

@ -0,0 +1,11 @@
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100
@@ -92,7 +92,7 @@
DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(vboxnetadp, 1);
MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1);
-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1);
+MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1);
/**
* Module event handler

View file

@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
.rcvmsg = ng_vboxnetflt_rcvmsg, .rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown, .shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook, .newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@ @@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{ {

View file

@ -7,7 +7,7 @@
PORTNAME= virtualbox PORTNAME= virtualbox
DISTVERSION= 3.0.51r22902 DISTVERSION= 3.0.51r22902
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \ MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \ http://freebsd.unixfreunde.de/sources/ \

View file

@ -0,0 +1,11 @@
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100
@@ -92,7 +92,7 @@
DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(vboxnetadp, 1);
MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1);
-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1);
+MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1);
/**
* Module event handler

View file

@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
.rcvmsg = ng_vboxnetflt_rcvmsg, .rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown, .shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook, .newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@ @@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{ {

View file

@ -7,7 +7,7 @@
PORTNAME= virtualbox PORTNAME= virtualbox
DISTVERSION= 3.0.51r22902 DISTVERSION= 3.0.51r22902
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \ MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \ http://freebsd.unixfreunde.de/sources/ \

View file

@ -0,0 +1,11 @@
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100
@@ -92,7 +92,7 @@
DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(vboxnetadp, 1);
MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1);
-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1);
+MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1);
/**
* Module event handler

View file

@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
.rcvmsg = ng_vboxnetflt_rcvmsg, .rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown, .shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook, .newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@ @@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{ {

View file

@ -7,7 +7,7 @@
PORTNAME= virtualbox PORTNAME= virtualbox
DISTVERSION= 3.0.51r22902 DISTVERSION= 3.0.51r22902
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \ MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \ http://freebsd.unixfreunde.de/sources/ \

View file

@ -0,0 +1,11 @@
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100
@@ -92,7 +92,7 @@
DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(vboxnetadp, 1);
MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1);
-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1);
+MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1);
/**
* Module event handler

View file

@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
.rcvmsg = ng_vboxnetflt_rcvmsg, .rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown, .shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook, .newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@ @@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{ {