Changeset 77776 in vbox

Timestamp:

Mar 19, 2019 4:30:10 AM (6 years ago)

Author:

vboxsync

Message:

Reverted r129368 as this was already addressed by r129145 and in a way which is compatible with 2.4 and early 2.6. The changset also made changes to two dtrace files by accident. bugref:4567 bugref:9172

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
 
-M=      $(MACH) demo test
+SUBDIRS=        $(MACH) demo test
 $(BUILD64)SUBDIRS += $(MACH64)
 

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

@@ -28 +28 @@
 include $(SRC)/Makefile.master
 
-M= common $(MACH:i386=i386 i86xpv)
+SUBDIRS= 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) M=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(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) M=$(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) SUBDIRS=$(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) M=$(CURDIR) SRCROOT=$(CURDIR) clean
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
 else
         $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) clean