Changeset 69529 in vbox for trunk

Timestamp:

Oct 30, 2017 5:42:36 PM (7 years ago)

Author:

vboxsync

Message:

Linux drivers: make it easier to use different kernel headers.
bugref:4567: Linux kernel driver maintenance

With this change it is possible to pass KERN_DIR on the command line to
specify which kernel headers to do test builds of kernel modules against.
The default is now the most recent headers found, not the matching headers
for the currently running kernel.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Additions/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4206 +4206 @@
  TEMPLATE_VBOXR0DRV_TOOL                = $(NO_SUCH_VARIABLE)
 
+ ifndef KERN_DIR
+  ifndef KERN_VER
+   KERN_VER=$(notdir $(lastword $(sort $(wildcard /lib/modules/*))))
+  endif
+  ifneq ($(KERN_VER),)
+   KERN_DIR=/lib/modules/$(KERN_VER)/build
+  endif
+ endif
+
 ##
 # Using the extra expansion to replace $(module) before eval, thus everything
 # else needs escaped dollars.
  define VBOX_LINUX_GENERATE_KMOD_TEST
-  VBOX_TARGET_$(module) = $$(PATH_TARGET)/tst$(module)_mod.run
+  VBOX_TARGET_$(module) = $$(PATH_TARGET)/tst$(module)$(subst /,_,$(KERN_DIR))_mod.run
   TESTING      += $$(VBOX_TARGET_$(module))
   OTHERS       += $$(VBOX_TARGET_$(module))
@@ -4220 +4229 @@
         $(QUIET)$$(MKDIR) -p -- "$$(PATH_TARGET)/tst$(module)_mod"
         $(QUIET)$$(CP) -R -- "$$(PATH_STAGE_BIN)/../$$($(module)_INST)" "$$(PATH_TARGET)/tst$(module)_mod/"
-        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod clean
-        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod
+        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$$(KERN_DIR) -C $$(PATH_TARGET)/tst$(module)_mod clean
+        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$$(KERN_DIR) -C $$(PATH_TARGET)/tst$(module)_mod
         $(QUIET)$$(RM) -Rf -- $$(PATH_TARGET)/tst$(module)_mod
         $(QUIET)$$(APPEND) -t "$$@" "done"

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -364 +364 @@
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
 
- $(foreach module, vboxguest-mod vboxsf-mod vboxvideo-mod, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+ ifneq ($(KERN_DIR),)
+  $(foreach module, vboxguest-mod vboxsf-mod vboxvideo-mod, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+ endif
 
 endif

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -77 +77 @@
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
 
- $(foreach module, vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src VBoxPci-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+ ifneq ($(KERN_DIR),)
+  $(foreach module, vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src VBoxPci-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+ endif
 
 endif