Changeset 77720 in vbox

Timestamp:

Mar 15, 2019 10:28:46 AM (6 years ago)

Author:

vboxsync

Message:

Drivers/Linux: drop SUBDIRS= from Make files for upcoming Linux 5.3 release.
bugref:4567: Linux kernel driver maintenance.
Builds have been complaining about this for quite some time:

/usr/src/linux-next/Makefile:193: ================= WARNING ================
/usr/src/linux-next/Makefile:194: :SUBDIRS: will be removed after Linux 5.3
/usr/src/linux-next/Makefile:195: Please use :M=: or :KBUILD_EXTMOD: instead
/usr/src/linux-next/Makefile:196: ==========================================

Says the git history:

commit 0126be38d98815d25d9ec4573541ed4315bf6a88
Author: Masahiro Yamada <yamada.masahiro@…>
Date: Wed Nov 21 00:04:18 2018 +0900

kbuild: announce removal of SUBDIRS if used

SUBDIRS has been kept as a backward compatibility since
commit (:[PATCH] kbuild: external module support:) in 2002.

Fix the makefiles to use M= rather than SUBDIRS=
Thank you Valdis Klētnieks for the patch!

Location:

trunk/src/VBox

Files:

• ExtPacks/VBoxDTrace/onnv/cmd/dtrace/Makefile (modified) (1 diff)
• ExtPacks/VBoxDTrace/onnv/cmd/dtrace/test/tst/Makefile (modified) (1 diff)
• Installer/linux/Makefile-footer.gmk (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/Makefile

@@ -31 +31 @@
 include ../Makefile.cmd
 
-SUBDIRS=        $(MACH) demo test
+M=      $(MACH) demo test
 $(BUILD64)SUBDIRS += $(MACH64)
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/test/tst/Makefile

@@ -28 +28 @@
 include $(SRC)/Makefile.master
 
-SUBDIRS= common $(MACH:i386=i386 i86xpv)
+M= common $(MACH:i386=i386 i86xpv)
 include ../Makefile.subdirs
 

trunk/src/VBox/Installer/linux/Makefile-footer.gmk

@@ -103 +103 @@
 $(VBOXMOD_0_TARGET):
 ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
 else
         $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
@@ -110 +110 @@
 install: $(VBOXMOD_0_TARGET)
 ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
 else
         $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
@@ -119 +119 @@
 clean:
 ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) clean
 else
         $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) clean