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

Timestamp:

Sep 1, 2010 3:53:42 PM (15 years ago)

Author:

vboxsync

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

65467

Message:

Linux Installer/Additions: attempt to properly register the host/guest kernel modules at DKMS and use the setup function of the service script to compile the modules instead of doing this separately in the installer scripts

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• Makefile.kmk (modified) (3 diffs)
• linux/Makefile (modified) (2 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2008 Oracle Corporation
+# Copyright (C) 2008-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -367 +367 @@
  VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
  VBoxNetFlt-src_SOURCES+= \
-        $(PATH_VBoxNetFlt-src)/dkms.conf \
         $(PATH_VBoxNetFlt-src)/Makefile
  VBoxNetFlt-src_CLEAN   = \
-        $(PATH_VBoxNetFlt-src)/dkms.conf \
         $(PATH_VBoxNetFlt-src)/Makefile \
         $(PATH_TARGET)/VBoxNetFlt-src-1.dep
@@ -403 +401 @@
         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetflt;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
         $(QUIET)chmod 0755 $@
-
- # Script needed for building the kernel module
- $$(PATH_VBoxNetFlt-src)/dkms.conf: \
-                $(PATH_SUB_CURRENT)/linux/dkms.conf \
-                $(VBOX_VERSION_STAMP) \
-                | $$(dir $$@)
-        $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
 
 endif # linux

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -6 +6 @@
 #
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -161 +161 @@
  endif
  INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
  export INCL
 endif