Changeset 14655 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Nov 26, 2008 5:45:21 PM (16 years ago)

Author:

vboxsync

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

39961

Message:

Linux drivers: try to hack around the DKMS problem with module dependencies

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/Makefile.kmk (modified) (2 diffs)
• Support/linux/dkms.conf (modified) (1 diff)
• VBoxNetFlt/Makefile.kmk (modified) (2 diffs)
• VBoxNetFlt/linux/Makefile (modified) (1 diff)
• VBoxNetFlt/linux/dkms.conf (modified) (1 diff)
• linux/Makefile (modified) (2 diffs)
• linux/build_in_tmp (moved) (moved from trunk/src/VBox/HostDrivers/Support/linux/build_in_tmp )

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

@@ -238 +238 @@
 vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
 vboxdrv-mod_SOURCES += \
-        $(if $(VBOX_OSE),,$(PATH_vboxdrv-mod)/dkms.conf) \
+        $(if $(VBOX_OSE),,\
+          $(PATH_vboxdrv-mod)/dkms.conf \
+          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers) \
         $(PATH_vboxdrv-mod)/Makefile
 vboxdrv-mod_CLEAN   = \
@@ -256 +258 @@
 
 $$(PATH_vboxdrv-sh)/build_in_tmp: \
-                $(PATH_SUB_CURRENT)/linux/build_in_tmp \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)

trunk/src/VBox/HostDrivers/Support/linux/dkms.conf

@@ -4 +4 @@
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes
+POST_BUILD="do_Module.symvers vboxdrv save $dkms_tree/$module/$module_version/build/Module.symvers"

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

@@ -187 +187 @@
  VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
  VBoxNetFlt-src_SOURCES+= \
-        $(if $(VBOX_OSE),,$(PATH_VBoxNetFlt-src)/dkms.conf) \
+        $(if $(VBOX_OSE),,\
+          $(PATH_VBoxNetFlt-src)/dkms.conf \
+          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers) \
         $(PATH_VBoxNetFlt-src)/Makefile
  VBoxNetFlt-src_CLEAN   = \
@@ -215 +217 @@
 
 $$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
-                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
+                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)

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

@@ -267 +267 @@
 endif # eq($(MAKECMDGOALS),clean)
 
+# important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
 clean:
         for f in . linux r0drv r0drv/linux VBox common/err common/string common/log generic math/gcc; \
             do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .vboxnetflt* .tmp_ver* vboxnetflt.* Module.symvers Modules.symvers modules.order
+        rm -rf .vboxnetflt* .tmp_ver* vboxnetflt.* Modules.symvers modules.order

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/dkms.conf

@@ -4 +4 @@
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes
+CLEAN="make -C $dkms_tree/$module/$module_version/build clean"
+PRE_BUILD="do_Module.symvers vboxdrv restore $dkms_tree/$module/$module_version/build/Module.symvers"

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -29 +29 @@
 #
 
+KBUILD_VERBOSE =
+
 all:
         @echo "*** Building 'vboxdrv' module ***"
-        @$(MAKE) KBUILD_VERBOSE= -C vboxdrv
+        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv
         @cp vboxdrv/vboxdrv.ko .
         @echo
@@ -39 +41 @@
             fi; \
             echo "*** Building 'vboxnetflt' module ***"; \
-            $(MAKE) KBUILD_VERBOSE= -C vboxnetflt; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt; \
             cp vboxnetflt/vboxnetflt.ko .; \
         fi