Changeset 76317 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 3:44:06 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,drivers/Makefile.kmk: Doing the cleanups of the VBOX_LINUX_GENERATE_KMOD_TEST feature that the author couldn't be bothered with doing himself.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• Additions/linux/Makefile.kmk (modified) (1 diff)
• HostDrivers/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -238 +238 @@
   && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
   ifneq ($(KERN_DIR),)
-   save_symvers = vboxguest-src
-   $(foreach module, vboxguest-src, $(evalcall2 VBOX_LINUX_GENERATE_KMOD_TEST))
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
   endif
  endif

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

@@ -367 +367 @@
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
  ifneq ($(KERN_DIR),)
-  use_symvers = vboxguest-src
-  module      = vboxsf-src
-  $(evalcall2 VBOX_LINUX_GENERATE_KMOD_TEST)
-  use_symvers =
-  module      = vboxvideo-src
-  $(evalcall2 VBOX_LINUX_GENERATE_KMOD_TEST)
+  $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxsf-src,vboxguest-src,)
+  $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxvideo-src,,)
  endif
 endif

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -76 +76 @@
  && "$(KBUILD_TARGET)" == "linux" \
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
-
  ifneq ($(KERN_DIR),)
-  save_symvers = vboxdrv-src
-  use_symvers  = vboxdrv-src
-  $(foreach module, vboxdrv-src $(if $(VBOX_WITH_NETFLT),VBoxNetFlt-src) \
-   $(if $(VBOX_WITH_NETADP),VBoxNetAdp-src) $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBoxPci-src), \
-   $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxdrv-src,,save_symvers)
+  ifdef VBOX_WITH_NETFLT
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetFlt-src,vboxdrv-src,)
+  endif
+  ifdef VBOX_WITH_NETADP
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetAdp-src,vboxdrv-src,)
+  endif
+  ifdef VBOX_WITH_PCI_PASSTHROUGH
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxPci-src,vboxdrv-src,)
+  endif
  endif
-
 endif