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

Timestamp:

Jun 30, 2020 5:21:19 PM (5 years ago)

Author:

vboxsync

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

138906

Message:

Linux modules: Allow user to override disabling of kernel module signing (some have a working setup). Also simplify the ifdef maze by figuring out which make variable needs to point to the kernel module source directory (SUBDIRS or M), finally getting back to one make command line.

File:

• trunk/src/VBox/Installer/linux/Makefile-footer.gmk (modified) (2 diffs)

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

@@ -101 +101 @@
  endif
 
-# rules:
-all: $(VBOXMOD_0_TARGET)
+VBOX_SUBDIR_VAR=$(if VBOX_KERN_GROKS_SUBDIRS,SUBDIRS,M)
 
 # OL/UEK: CONFIG_MODULE_SIG= disables module signing for external modules.
@@ -108 +107 @@
 # We disable signing because we don't have any private key and want to leave
 # the key handling and secure boot config to the user.
+ ifndef VBOX_ALLOW_MODULE_SIGNING
+VBOX_DISABLE_SIGN=CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL=
+ endif
+
+# rules:
+all: $(VBOXMOD_0_TARGET)
+
 $(VBOXMOD_0_TARGET):
-ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
-else
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
-endif
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
 
 install: $(VBOXMOD_0_TARGET)
-ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL= -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= CONFIG_MODULE_SIG_ALL= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
-endif
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
 
 modules_install: install
 
 clean:
-ifneq ($(VBOX_KERN_GROKS_SUBDIRS),)
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
-else
-        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= CONFIG_MODULE_SIG_ALL= -C $(KERN_DIR) M=$(CURDIR) SRCROOT=$(CURDIR) clean
-endif
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) clean
 
 .PHONY: all $(VBOXMOD_0_TARGET) install modules_install clean