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

Timestamp:

Feb 20, 2019 6:40:26 PM (6 years ago)

Author:

vboxsync

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

128955

Message:

More linux kernel module Makefile cleanups: KFLAGS and LINUX_VERBOSE are internal variables belonging to us, make that perfectly clear from their names.

File:

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

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

@@ -20 +20 @@
 VBOXMOD_0_TARGET = $(VBOXMOD_NAME)
 
-KBUILD_VERBOSE ?= 1
-LINUX_VERBOSE = $(if $(KBUILD_VERBOSE),1,)
+KBUILD_VERBOSE ?= 1 # Variable belongs to our kBuild, not the linux one.
+VBOX_LNX_VERBOSE = $(if $(KBUILD_VERBOSE),1,)
 
 #
@@ -28 +28 @@
 VBOX_INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL)) $(VBOXMOD_INCL)
 
-KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(VBOXMOD_DEFS))
+VBOXMOD_0_KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(VBOXMOD_DEFS))
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-KFLAGS += -DRT_ARCH_AMD64
+VBOXMOD_0_KFLAGS += -DRT_ARCH_AMD64
 else
-KFLAGS += -DRT_ARCH_X86
+VBOXMOD_0_KFLAGS += -DRT_ARCH_X86
 endif
 
@@ -38 +38 @@
 # The -Wno-array-bounds is because of a bug in gcc 4.something, see
 # https://sourceware.org/bugzilla/show_bug.cgi?id=10001
- KFLAGS  += -DDEBUG -DDEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) -DDEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
+ VBOXMOD_0_KFLAGS  += -DDEBUG -DDEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) -DDEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
  ifeq ($(shell expr $(KERN_VER) : '[23]\.'),0)
-  KFLAGS  += -Werror -Wall -Wno-array-bounds
+  VBOXMOD_0_KFLAGS  += -Werror -Wall -Wno-array-bounds
  endif
 endif
@@ -56 +56 @@
 
 ifeq ($(BUILD_TARGET_ARCH),amd64)
- KFLAGS += -mcmodel=kernel
+ VBOXMOD_0_KFLAGS += -mcmodel=kernel
 endif
 
-CFLAGS := -O2 -DVBOX_LINUX_2_4 $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
+CFLAGS := -O2 -DVBOX_LINUX_2_4 $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(VBOXMOD_0_KFLAGS) $(KDEBUG)
 
 # 2.4 Module linking
@@ -87 +87 @@
 
 # build defs
-EXTRA_CFLAGS += $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
+EXTRA_CFLAGS += $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(VBOXMOD_0_KFLAGS) $(KDEBUG)
 $(VBOXMOD_0_TARGET)-y := $(VBOXMOD_OBJS)
 obj-m += $(VBOXMOD_0_TARGET).o
@@ -103 +103 @@
 # OL/UEK: disable module signing for external modules -- we don't have any private key
 $(VBOXMOD_0_TARGET):
-        $(MAKE) V=$(LINUX_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) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
 
 install: $(VBOXMOD_0_TARGET)
-        $(MAKE) V=$(LINUX_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) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
 
 modules_install: install
 
 clean:
-        $(MAKE) V=$(LINUX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
+        $(MAKE) V=$(VBOX_LNX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
 
 .PHONY: all $(VBOXMOD_0_TARGET) install modules_install clean