Changeset 23526 in vbox

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

Files:

• Makefile.kmk (modified) (1 diff)
• Support/Makefile.kmk (modified) (3 diffs)
• Support/SUPDrvInternal.h (modified) (1 diff)
• Support/freebsd/Makefile (added)
• Support/freebsd/files_vboxdrv (added)
• VBoxNetAdp/Makefile.kmk (modified) (1 diff)
• VBoxNetAdp/freebsd/Makefile (added)
• VBoxNetAdp/freebsd/files_vboxnetadp (added)
• VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• VBoxNetFlt/freebsd/Makefile (added)
• VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (modified) (2 diffs)
• VBoxNetFlt/freebsd/files_vboxnetflt (added)
• freebsd (added)

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -41 +41 @@
  endif
 
- ifeq ($(KBUILD_TARGET),linux)
+ if1of ($(KBUILD_TARGET),linux freebsd)
   #
-  # Install the Makefile for module compliation on Linux hosts
+  # Install the Makefile for module compliation on Linux and FreeBSD hosts
   #
   INSTALLS += HostDrivers-src
   HostDrivers-src_INST    = bin/src/
   HostDrivers-src_MODE    = a+r,u+w
-  HostDrivers-src_SOURCES = linux/Makefile
+  HostDrivers-src_SOURCES.linux = linux/Makefile
+  HostDrivers-src_SOURCES.freebsd = freebsd/Makefile
  endif
 
+ if1of ($(KBUILD_TARGET),freebsd)
+  #
+  # Install the export_modules script for tar'ing the module sources on FreeBSD hosts
+  #
+  INSTALLS += HostDrivers-sh
+  HostDrivers-sh_INST    = bin/
+  HostDrivers-sh_MODE    = a+rx,u+w
+  HostDrivers-sh_SOURCES.freebsd = freebsd/export_modules
+ endif
 endif # !VBOX_ONLY_DOCS
 

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

@@ -52 +52 @@
  endif
  INSTALLS.linux   += vboxdrv-mod vboxdrv-sh
+ INSTALLS.freebsd += vboxdrv-mod vboxdrv-sh
 
  #
@@ -61 +62 @@
  # Populate FILES_VBOXDRV_NOBIN and FILES_VBOXDRV_BIN
  #
- include $(PATH_SUB_CURRENT)/linux/files_vboxdrv
+ ifeq ($(KBUILD_TARGET),linux)
+  include $(PATH_SUB_CURRENT)/linux/files_vboxdrv
+ endif
+ ifeq ($(KBUILD_TARGET),freebsd)
+  include $(PATH_SUB_CURRENT)/freebsd/files_vboxdrv
+ endif
 endif # !VBOX_ONLY_DOCS
 
@@ -409 +415 @@
         SUPDrv.c
 ## @todo the SUPDrv-freebsd.def is most probably gonna break it and require build system hacking...
+
+#
+# Targets for installing the freebsd sources.
+#
+vboxdrv-mod_INST    = bin/src/vboxdrv/
+vboxdrv-mod_MODE    = a+r,u+w
+vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
+vboxdrv-mod_SOURCES += \
+        $(PATH_vboxdrv-mod)/Makefile
+vboxdrv-mod_CLEAN   = \
+        $(PATH_vboxdrv-mod)/Makefile
 endif # freebsd
 
+$$(PATH_vboxdrv-mod)/Makefile: \
+                $(PATH_SUB_CURRENT)/freebsd/Makefile \
+                $$(if $$(eq $$(Support/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
+                | $$(dir $$@)
+        $(call MSG_TOOL,Creating,,$@)
+ ifndef VBOX_WITH_HARDENING
+        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+ else
+        $(QUIET)$(CP) -f $< $@
+ endif
 
 #

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -123 +123 @@
 #   define strchr  libkern_strchr
 #   define strrchr libkern_strrchr
-#   define ffs     libkern_ffs
 #   define ffsl    libkern_ffsl
 #   define fls     libkern_fls

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

@@ -153 +153 @@
 endif # linux
 
+ifeq ($(KBUILD_TARGET),freebsd)
+ #
+ # Install source files for compliation on FreeBSD.
+ # files_vboxnetadp defines VBOX_VBOXNETADP_SOURCES.
+ #
+ include $(PATH_SUB_CURRENT)/freebsd/files_vboxnetadp
+ INSTALLS += VBoxNetAdp-src
+ VBoxNetAdp-src_INST    = bin/src/vboxnetadp/
+ VBoxNetAdp-src_MODE    = a+r,u+w
+ VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
+ VBoxNetAdp-src_SOURCES+= \
+        $(PATH_VBoxNetAdp-src)/Makefile
+ VBoxNetAdp-src_CLEAN   = \
+        $(PATH_VBoxNetAdp-src)/Makefile \
+
+$$(PATH_VBoxNetAdp-src)/Makefile: \
+                $(PATH_SUB_CURRENT)/freebsd/Makefile \
+                $$(if $$(eq $$(VBoxNetAdp/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
+
 include $(KBUILD_PATH)/subfooter.kmk
 

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);
             }