Changeset 77389 in vbox

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

Files:

• Additions/linux/Makefile (modified) (5 diffs)
• Additions/linux/sharedfolders/Makefile.module (modified) (6 diffs)
• Installer/linux/Makefile.include.footer (modified) (6 diffs)
• Installer/linux/Makefile.include.header (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile

@@ -25 +25 @@
 
 KBUILD_VERBOSE =
+ ifeq ($(KBUILD_VERBOSE),)
+VBOX_QUIET    := @
+VBOX_QUIET_SH := @
+ else
+VBOX_QUIET    :=
+VBOX_QUIET_SH := set -x;
+ endif
 
 vboxguest:
         @echo "=== Building 'vboxguest' module ==="
-        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
-        @if [ -f vboxguest/vboxguest.ko ]; then \
+        $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
+        $(VBOX_QUIET_SH)if [ -f vboxguest/vboxguest.ko ]; then \
             cp vboxguest/vboxguest.ko .; \
          else \
@@ -37 +44 @@
 
 vboxsf: vboxguest
-        @if [ -d vboxsf ]; then \
+        $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
             if [ -f vboxguest/Module.symvers ]; then \
                 cp vboxguest/Module.symvers vboxsf; \
@@ -52 +59 @@
 
 vboxvideo:
-        @if [ -d vboxvideo ]; then \
+        $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             if [ -f vboxguest/Module.symvers ]; then \
                 cp vboxguest/Module.symvers vboxvideo; \
@@ -69 +76 @@
 
 install:
-        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
-        @if [ -d vboxsf ]; then \
+        $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
+        $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \
         fi
-        @if [ -d vboxvideo ]; then \
+        $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
         fi
 
 clean:
-        @$(MAKE) -C vboxguest clean
-        @if [ -d vboxsf ]; then \
+        $(VBOX_QUIET)$(MAKE) -C vboxguest clean
+        $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
             $(MAKE) -C vboxsf clean; \
         fi
-        @if [ -d vboxvideo ]; then \
+        $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
             $(MAKE) -C vboxvideo clean; \
         fi
@@ -88 +95 @@
 
 check:
-        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest check
+        $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest check
 
 load:
-        @/sbin/rmmod vboxvideo || true
-        @/sbin/rmmod vboxvfs || true
-        @/sbin/rmmod vboxsf || true
-        @/sbin/rmmod vboxguest || true
-        @/sbin/insmod vboxguest.ko
-        @if [ -f vboxsf.ko ]; then /sbin/insmod vboxsf.ko; fi
-        @if [ -f vboxvideo.ko ]; then /sbin/insmod vboxvideo.ko; fi
+        $(VBOX_QUIET)/sbin/rmmod vboxvideo || true
+        $(VBOX_QUIET)/sbin/rmmod vboxvfs || true
+        $(VBOX_QUIET)/sbin/rmmod vboxsf || true
+        $(VBOX_QUIET)/sbin/rmmod vboxguest || true
+        $(VBOX_QUIET)/sbin/insmod vboxguest.ko
+        $(VBOX_QUIET)if [ -f vboxsf.ko ]; then /sbin/insmod vboxsf.ko; fi
+        $(VBOX_QUIET)if [ -f vboxvideo.ko ]; then /sbin/insmod vboxvideo.ko; fi
 
 .PHONY: vboxguest vboxsf vboxvideo all install clean check load

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -18 +18 @@
 #
 
+# Find the directory of this makefile.
+VBOXSF_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+
 # Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
@@ -23 +26 @@
 
 MOD_NAME = vboxsf
-MOD_OBJS   = \
+MOD_OBJS = \
         vfsmod.o \
         dirops.o \
@@ -37 +40 @@
         VBoxGuestR0LibSharedFolders.o
 ifeq ($(BUILD_TARGET_ARCH),x86)
-MOD_OBJS  += \
+MOD_OBJS += \
         divdi3.o \
         moddi3.o \
@@ -46 +49 @@
 endif
 
-MOD_INCL = \
-    $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) \
-    $(addprefix -I$(KBUILD_EXTMOD)/vboxsf,/ /include /r0drv/linux)
+MOD_INCL = -I$(VBOXSF_DIR) -I$(VBOXSF_DIR)include -I$(VBOXSF_DIR)r0drv/linux -I`pwd` -I`pwd`
 
-ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxsf),)
- MANGLING := $(KBUILD_EXTMOD)/vboxsf/include/VBox/VBoxGuestMangling.h
-else
- MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
-endif
-
-MOD_DEFS   = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-            -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST -DIN_GUEST_R0
+MOD_DEFS   = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST -DIN_GUEST_R0
 # our module does not export any symbol
 MOD_DEFS  += -DRT_NO_EXPORT_SYMBOL
@@ -69 +63 @@
  MOD_CFLAGS =
 else
- MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie
+ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
 
 # special hack for Fedora Core 6 2.6.18 (fc6), rhel5 2.6.18 (el5),
@@ -96 +90 @@
 
 include $(obj)/Makefile.include.footer
+

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
+