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

Timestamp:

Feb 20, 2019 3:34:01 PM (6 years ago)

Author:

vboxsync

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

128940

Message:

linux module makefile tinkering & cleaning up.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.include.footer (modified) (6 diffs)
• Makefile.include.header (modified) (2 diffs)

trunk/src/VBox/Installer/linux/Makefile.include.footer

@@ -18 +18 @@
 #
 
+#
+# Note! The MOD_XXX variables are ours and does not directly influence the
+#       kernel build system.  When adding more variables, please prefix them
+#       with VBOX_ so we can tell more easily who's variable it is.
+#
+
 # override is required by the Debian guys
 override MODULE = $(MOD_NAME)
@@ -28 +34 @@
 # Compiler options
 #
-ifndef INCL
- INCL    := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
-  KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL    += $(MOD_INCL)
- export INCL
-endif
+VBOX_INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL)) $(MOD_INCL)
+
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(MOD_DEFS)
 ifeq ($(BUILD_TYPE),debug)
@@ -46 +46 @@
 endif
 
-ifeq ($(KERN_VERSION), 24)
+ifeq ($(KERN_VERSION),24)
 #
 # 2.4
@@ -57 +57 @@
 
 ifeq ($(BUILD_TARGET_ARCH),amd64)
- KFLAGS  += -mcmodel=kernel
+ KFLAGS += -mcmodel=kernel
 endif
 
-CFLAGS := -O2 -DVBOX_LINUX_2_4 $(MOD_CFLAGS) $(INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
+CFLAGS := -O2 -DVBOX_LINUX_2_4 $(MOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
 MODULE_EXT := o
 
 # 2.4 Module linking
-$(MODULE).o: $(OBJS)
+$(MODULE).$(MODULE_EXT): $(OBJS)
         $(LD) -o $@ -r $(OBJS)
 
 .PHONY: $(MODULE)
 all: $(MODULE)
-$(MODULE): $(MODULE).o
+$(MODULE): $(MODULE).$(MODULE_EXT)
 
 install: $(MODULE)
@@ -83 +83 @@
 #
 # 2.6 and later
+## @todo XXX does not work for 2.6.5 and earlier (see KBUILD_EXTMOD in header).
 #
 
@@ -90 +91 @@
 
 # build defs
-EXTRA_CFLAGS += $(MOD_CFLAGS) $(INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
+EXTRA_CFLAGS += $(MOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
 
 .PHONY: $(MODULE)

trunk/src/VBox/Installer/linux/Makefile.include.header

@@ -152 +152 @@
 MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
 
+#
+# The KBUILD_EXTMOD variable is used by 2.6.6 and later when build external
+# modules (see https://lwn.net/Articles/79984/).  It will be set to SUBDIRS
+# or M by the linux kernel makefile.  We fake it here for older kernels.
+#
+## @todo Drop this KBUILD_EXTMOD glue once it has been removed from all our makefiles (see sharedfolders).
+ifndef KBUILD_EXTMOD
+ ifndef CURDIR # for make < v3.79
+  CURDIR := $(shell pwd)
+ endif
+ KBUILD_EXTMOD := $(CURDIR)
+endif
+
 # debug - show guesses.
 ifdef DEBUG
@@ -161 +174 @@
 $(warning dbg: KERN_VERSION     = $(KERN_VERSION))
 $(warning dbg: MODULE_DIR       = $(MODULE_DIR))
+$(warning dbg: KBUILD_EXTMOD    = $(KBUILD_EXTMOD))
+$(warning dbg: VBOX_ROOT_DIR    = $(VBOX_ROOT_DIR))
  endif
 endif
+