Changeset 23526 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Oct 3, 2009 5:55:49 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53169

Message:

HostDrivers/FreeBSD: Use the same method to build the kernel drivers as Linux.

To build the kernel drivers go into out/freebsd.{amd64,x86}/{release,debug}/bin/src
after the build and execute make. make load will load the kernel drivers.
The old way is only used for syntax checking and the resulting modules may not even load anymore.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• Makefile.kmk (modified) (1 diff)
• freebsd/Makefile (added)
• freebsd/VBoxNetFlt-freebsd.c (modified) (2 diffs)
• freebsd/files_vboxnetflt (added)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -401 +401 @@
 $(PATH_OUT)/opt_netgraph.h:
         echo > $(PATH_OUT)/opt_netgraph.h
+
+ #
+ # Install source files for compliation on FreeBSD.
+ # files_vboxnetflt defines VBOX_VBOXNETFLT_SOURCES.
+ #
+ include $(PATH_SUB_CURRENT)/freebsd/files_vboxnetflt
+ INSTALLS += VBoxNetFlt-src
+ VBoxNetFlt-src_INST    = bin/src/vboxnetflt/
+ VBoxNetFlt-src_MODE    = a+r,u+w
+ VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
+ VBoxNetFlt-src_SOURCES+= \
+        $(PATH_VBoxNetFlt-src)/Makefile
+ VBoxNetFlt-src_CLEAN   = \
+        $(PATH_VBoxNetFlt-src)/Makefile \
+
+ $$(PATH_VBoxNetFlt-src)/Makefile: \
+                $(PATH_SUB_CURRENT)/freebsd/Makefile \
+                $$(if $$(eq $$(VBoxNetFlt/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
+                | $$(dir $$@)
+ ifndef VBOX_WITH_HARDENING
+        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+ else
+        $(QUIET)$(CP) -f $< $@
+ endif
 endif # freebsd
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c

@@ -146 +146 @@
             if (RT_FAILURE(rc))
             {
-                Log(("RTR0Init failed %d\n", rc));
+                printf("RTR0Init failed %d\n", rc);
                 return RTErrConvertToErrno(rc);
             }
@@ -154 +154 @@
             if (RT_FAILURE(rc))
             {
-                Log(("vboxNetFltInitGlobalsAndIdc failed %d\n", rc));
+                printf("vboxNetFltInitGlobalsAndIdc failed %d\n", rc);
                 return RTErrConvertToErrno(rc);
             }