Changeset 77400 in vbox

Timestamp:

Feb 20, 2019 6:36:27 PM (6 years ago)

Author:

vboxsync

Message:

More linux kernel module Makefile cleanups: Seems MODULE is not a special variable to anyone but ourselves, so make it clear that it is ours and that it is only defined after the footer is included.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/Makefile (modified) (1 diff)
• Installer/linux/Makefile-footer.gmk (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -172 +172 @@
 include $(obj)/Makefile-footer.gmk
 
-check: $(MODULE)
+check: $(VBOXMOD_0_TARGET)
         @if ! readelf -p __ksymtab_strings vboxdrv.ko | grep -E "\[.*\]  *(RT|g_..*RT.*)"; then \
             echo "All exported IPRT symbols are properly renamed!"; \

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

@@ -18 +18 @@
 #
 
-# override is required by the Debian guys
-override MODULE = $(VBOXMOD_NAME)
-OBJS = $(VBOXMOD_OBJS)
+VBOXMOD_0_TARGET = $(VBOXMOD_NAME)
 
 KBUILD_VERBOSE ?= 1
@@ -50 +48 @@
 # 2.4
 #
-
 # Note: while 2.4 kernels could also do "proper" builds from kbuild, the make
 # script needed to support it was somewhat different from 2.6.  Since this
 # script works and 2.4 is not a moving target we will not try do do things the
 # "proper" way.
+#
+VBOXMOD_EXT := o
 
 ifeq ($(BUILD_TARGET_ARCH),amd64)
@@ -61 +60 @@
 
 CFLAGS := -O2 -DVBOX_LINUX_2_4 $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
-MODULE_EXT := o
 
 # 2.4 Module linking
-$(MODULE).$(MODULE_EXT): $(OBJS)
-        $(LD) -o $@ -r $(OBJS)
+$(VBOXMOD_0_TARGET).$(VBOXMOD_EXT): $(VBOXMOD_OBJS)
+        $(LD) -o $@ -r $(VBOXMOD_OBJS)
 
-.PHONY: $(MODULE)
-all: $(MODULE)
-$(MODULE): $(MODULE).$(MODULE_EXT)
+.PHONY: $(VBOXMOD_0_TARGET)
+all: $(VBOXMOD_0_TARGET)
+$(VBOXMOD_0_TARGET): $(VBOXMOD_0_TARGET).$(VBOXMOD_EXT)
 
-install: $(MODULE)
+install: $(VBOXMOD_0_TARGET)
         @mkdir -p $(MODULE_DIR); \
-        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
+        install -m 0644 -o root -g root $(VBOXMOD_0_TARGET).$(VBOXMOD_EXT) $(MODULE_DIR); \
         PATH="$(PATH):/bin:/sbin" depmod -a; sync
 
 clean:
-        for f in $(sort $(dir $(OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
+        for f in $(sort $(dir $(VBOXMOD_OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
         rm -rf .$(VBOXMOD_NAME)* .tmp_ver* $(VBOXMOD_NAME).* Modules.symvers modules.order
 
@@ -83 +81 @@
 #
 # 2.6 and later
+#
 ## @todo XXX does not work for 2.6.5 and earlier (see KBUILD_EXTMOD in header).
 #
-
-MODULE_EXT := ko
-
-$(MODULE)-y  := $(OBJS)
+VBOXMOD_EXT := ko
 
 # build defs
 EXTRA_CFLAGS += $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
+$(VBOXMOD_0_TARGET)-y := $(VBOXMOD_OBJS)
+obj-m += $(VBOXMOD_0_TARGET).o
 
-.PHONY: $(MODULE)
-all: $(MODULE)
-
-obj-m += $(MODULE).o
-
+# Trigger parallel make job.
 JOBS := $(shell (getconf _NPROCESSORS_ONLN || grep -Ec '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
 ifeq ($(JOBS),0)
-  override JOBS := 1
+ override JOBS := 1
 endif
 
+# rules:
+.PHONY: $(VBOXMOD_0_TARGET)
+all: $(VBOXMOD_0_TARGET)
+
 # OL/UEK: disable module signing for external modules -- we don't have any private key
-$(MODULE):
+$(VBOXMOD_0_TARGET):
         $(MAKE) V=$(LINUX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
 
-install: $(MODULE)
+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
 
@@ -115 +113 @@
         $(MAKE) V=$(LINUX_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
 
-.PHONY: $(MODULE) install modules_install clean
+.PHONY: all $(VBOXMOD_0_TARGET) install modules_install clean
 endif