Changeset 68845 in vbox

Timestamp:

Sep 24, 2017 4:29:54 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux: do not re-test building all kernel modules if one has changed.
bugref:4567: Linux kernel driver maintenance

If one of the Additions kernel modules was changed and we re-run kmk, up
until now the build system did a test rebuild of all three. Change that
to only rebuild the one which was changed.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/Makefile.kmk (modified) (2 diffs)
• linux/Makefile.kmk (modified) (1 diff)
• linux/drm/Makefile.kmk (modified) (1 diff)

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

@@ -202 +202 @@
  include $(PATH_SUB_CURRENT)/linux/files_vboxguest
  # sources and stuff.
- INSTALLS += vboxguest-src
- vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
- vboxguest-src_MODE     = a+r,u+w
- vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
+ INSTALLS += vboxguest-mod
+ vboxguest-mod_INST     = $(INST_ADDITIONS)src/vboxguest/
+ vboxguest-mod_MODE     = a+r,u+w
+ vboxguest-mod_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
 
  INSTALLS += vboxguest-scripts
@@ -226 +226 @@
  include $(PATH_SUB_CURRENT)/freebsd/files_vboxguest
  # sources and stuff.
- INSTALLS += vboxguest-src
- vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
- vboxguest-src_MODE     = a+r,u+w
- vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
+ INSTALLS += vboxguest-mod
+ vboxguest-mod_INST     = $(INST_ADDITIONS)src/vboxguest/
+ vboxguest-mod_MODE     = a+r,u+w
+ vboxguest-mod_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
 
 endif # FreeBSD

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

@@ -362 +362 @@
  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
- VBOX_LNX_ADD_TEST        = $(PATH_TARGET)/tstguest_mod
- VBOX_LNX_ADD_TEST_TARGET = $(PATH_TARGET)/tstguest_mod.run
- TESTING     += $(VBOX_LNX_ADD_TEST_TARGET)
- OTHERS      += $(VBOX_LNX_ADD_TEST_TARGET)
- OTHER_CLEAN += $(VBOX_LNX_ADD_TEST_TARGET)
- $$(VBOX_LNX_ADD_TEST_TARGET): \
-                $$(vboxguest-src_2_STAGE_TARGETS) \
-                $$(vboxsf-mod_2_STAGE_TARGETS) \
-                $$(vboxvideo_drm-mod_2_STAGE_TARGETS) \
-                $$(GuestDrivers-src_2_STAGE_TARGETS)
-        $(QUIET)$(call MSG_L1,Doing a test build of the guest kernel modules)
-        $(QUIET)$(RM) -f -- "$@"
-        $(QUIET)$(RM) -Rf -- "$(VBOX_LNX_ADD_TEST)"
-        $(QUIET)$(MKDIR) -p -- "$(VBOX_LNX_ADD_TEST)"
-        $(QUIET)$(CP) -R -- "$(PATH_STAGE_BIN)/additions/src/" "$(VBOX_LNX_ADD_TEST)/"
-        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST) clean
-        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST)
-        $(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_TEST)
-        $(QUIET)$(APPEND) -t "$@" "done"
+
+ KBUILD_VERBOSE ?=
+
+##
+# Using the extra expansion to replace $(ver) before eval, thus everything
+# else needs escaped dollars.
+ define def_vboxadd_mod_test
+  TESTING      += $$(PATH_TARGET)/tst$(module)_mod.run
+  OTHERS       += $$(PATH_TARGET)/tst$(module)_mod.run
+  OTHERS_CLEAN += $$(PATH_TARGET)/tst$(module)_mod.run
+  $$$$(PATH_TARGET)/tst$(module)_mod.run: $$$$($(module)-mod_2_STAGE_TARGETS)
+        $(QUIET)$$(call MSG_L1,Doing a test build of the $(module) kernel module)
+        $(QUIET)$$(RM) -f -- "$@"
+        $(QUIET)$$(RM) -Rf -- "$$(PATH_TARGET)/tst$(module)_mod"
+        $(QUIET)$$(MKDIR) -p -- "$$(PATH_TARGET)/tst$(module)_mod"
+        $(QUIET)$$(CP) -R -- "$$(PATH_STAGE_BIN)/additions/src/$(module)/" "$$(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)$$(RM) -Rf -- $$(PATH_TARGET)/tst$(module)_mod
+        $(QUIET)$$(APPEND) -t "$$@" "done"
+ endef
+ $(foreach module, vboxguest vboxsf vboxvideo, $(eval $(def_vboxadd_mod_test)))
+
 endif
 

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

@@ -22 +22 @@
 # Populate FILES_VBOXVIDEO_DRM_NOBIN
 #
-INSTALLS += vboxvideo_drm-mod
+INSTALLS += vboxvideo-mod
 include $(PATH_SUB_CURRENT)/files_vboxvideo_drv
-vboxvideo_drm-mod_DEPS         = $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed
-vboxvideo_drm-mod_INST         = $(INST_ADDITIONS)src/vboxvideo/
-vboxvideo_drm-mod_SOURCES      = \
+vboxvideo-mod_DEPS         = $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed
+vboxvideo-mod_INST         = $(INST_ADDITIONS)src/vboxvideo/
+vboxvideo-mod_SOURCES      = \
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN))
-vboxvideo_drm-mod_EXEC_SOURCES = \
+vboxvideo-mod_EXEC_SOURCES = \
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN))
-vboxvideo_drm-mod_INSTALLER = $(RM_EXT) -f -- "$2" && \
+vboxvideo-mod_INSTALLER = $(RM_EXT) -f -- "$2" && \
     $(if $(filter %.c %.h,$2),$(SED) -f $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed \
     --output "$2" "$1",$(CP_EXT) "$1" "$2") && \