Changeset 77541 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Mar 3, 2019 4:39:14 AM (6 years ago)

Author:

vboxsync

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

129145

Message:

Installer/linux: Use M instead of SUBDIRS for kernel version 5 and higher. SUBDIRS is to be discontiuned in linux 5.3 they say. We can probably use M for older kernels too, but not in a mood to do testing building right now. bugref:9172

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile-footer.gmk (modified) (1 diff)
• Makefile-header.gmk (modified) (2 diffs)

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

@@ -102 +102 @@
 # OL/UEK: disable module signing for external modules -- we don't have any private key
 $(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
+else
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
+endif
 
 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
+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
+endif
 
 modules_install: install
 
 clean:
+ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
         $(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
+endif
 
 .PHONY: all $(VBOXMOD_0_TARGET) install modules_install clean

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

@@ -126 +126 @@
   ifeq ($(shell if grep '"2\.6\.[012345][."]' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
    VBOX_KERN_GROKS_EXTMOD :=
-  else
-  endif
- endif
-
+  endif
+  VBOX_KERN_GROKS_SUBDIRS  :=
+  ifeq ($(shell if grep '"[432]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
+   VBOX_KERN_GROKS_SUBDIRS := yes
+  endif
+ endif
 else # neq($(KERNELRELEASE),)
 
@@ -147 +149 @@
     VBOX_KERN_GROKS_EXTMOD :=
    endif
+  endif
+  VBOX_KERN_GROKS_SUBDIRS  :=
+  ifeq ($(VERSION),2)
+   VBOX_KERN_GROKS_SUBDIRS := yes
+  endif
+  ifeq ($(VERSION),3)
+   VBOX_KERN_GROKS_SUBDIRS := yes
+  endif
+  ifeq ($(VERSION),4)
+   VBOX_KERN_GROKS_SUBDIRS := yes
   endif
  endif