Changeset 85939 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Aug 28, 2020 6:36:30 PM (4 years ago)

Author:

vboxsync

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

140134

Message:

Additions/linux/Makefile, HostDrivers/linux/Makefile: Many cleanups in the Linux kernel module Makefiles, making them more uniform, and allow install of individual modules. Additionally, allow building of the kernel modules straight from the respective subdirectory (no dependencies across directories, so vboxdrv/vboxguest still needs to be built first, otherwise you end up with undefined symbols). Finally some parallelization improvements. At the top level still uses the Module.symvers copying and somewhat quirky KBUILD_EXTRA_SYMBOLS pointing to the copy, because this is backwards compatible to before KBUILD_EXTRA_SYMBOLS was invented.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile (modified) (2 diffs)
• drm/Makefile.module.kms (modified) (1 diff)
• sharedfolders/Makefile.module (modified) (1 diff)

trunk/src/VBox/Additions/linux/Makefile

@@ -60 +60 @@
         fi
 
-vboxvideo:
+vboxvideo: vboxguest
         + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             if [ -f vboxguest/Module.symvers ]; then \
@@ -75 +75 @@
         fi
 
-install:
+install_vboxguest:
         + $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
+
+install_vboxsf:
         + $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \
         fi
+
+install_vboxvideo:
         + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
         fi
 
-clean-vboxdrv:
+install: install_vboxguest install_vboxsf install_vboxvideo
+
+clean_vboxguest:
         + $(VBOX_QUIET)$(MAKE) -C vboxguest clean
+        rm -f vboxguest.*o
 
-clean-vboxsf:
+clean_vboxsf:
         + $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
             $(MAKE) -C vboxsf clean; \
         fi
+        rm -f vboxsf.*o
 
-clean-vboxvideo:
+clean_vboxvideo:
         + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             $(MAKE) -C vboxvideo clean; \
         fi
+        rm -f vboxvideo.*o
 
-clean-misc:
-        rm -f vboxguest.*o vboxsf.*o vboxvideo.*o
-
-clean: clean-vboxdrv clean-vboxsf clean-vboxvideo clean-misc
+clean: clean_vboxguest clean_vboxsf clean_vboxvideo
 
 check:
         $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest check
 
-load:
+unload:
         $(VBOX_QUIET)/sbin/rmmod vboxvideo || true
         $(VBOX_QUIET)/sbin/rmmod vboxvfs || true
         $(VBOX_QUIET)/sbin/rmmod vboxsf || true
         $(VBOX_QUIET)/sbin/rmmod vboxguest || true
+
+load: unload
         $(VBOX_QUIET)/sbin/insmod vboxguest.ko
         $(VBOX_QUIET)if [ -f vboxsf.ko ]; then /sbin/insmod vboxsf.ko; fi
         $(VBOX_QUIET)if [ -f vboxvideo.ko ]; then /sbin/insmod vboxvideo.ko; fi
 
-.PHONY: vboxguest vboxsf vboxvideo all install clean check load
+.PHONY: all install clean check unload load \
+    vboxguest vboxsf vboxvideo \
+    install_vboxguest install_vboxsf install_vboxvideo \
+    clean_vboxguest clean_vboxsf clean_vboxvideo
 
 endif # ! KERNELRELEASE

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -22 +22 @@
 include $(obj)/Makefile-header.gmk
 VBOXDRM_DIR = $(VBOX_MODULE_SRC_DIR)
+
+# Allow building directly from the subdirectory without assuming the toplevel
+# makefile has done the copying. Not the default use case, but can be handy.
+ifndef KBUILD_EXTRA_SYMBOLS
+KBUILD_EXTRA_SYMBOLS=$(abspath $(VBOXDRM_DIR)/../vboxguest/Module.symvers)
+endif
 
 # We want to build on Linux 3.11 and later and on all EL 7 kernels.

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -22 +22 @@
 include $(obj)/Makefile-header.gmk
 VBOXSF_DIR = $(VBOX_MODULE_SRC_DIR)
+
+# Allow building directly from the subdirectory without assuming the toplevel
+# makefile has done the copying. Not the default use case, but can be handy.
+ifndef KBUILD_EXTRA_SYMBOLS
+KBUILD_EXTRA_SYMBOLS=$(abspath $(VBOXSF_DIR)/../vboxguest/Module.symvers)
+endif
 
 VBOXMOD_NAME = vboxsf