Changeset 78446 in vbox

Timestamp:

May 8, 2019 10:57:05 AM (6 years ago)

Author:

vboxsync

Message:

Installer/Linux: remove last uses of KBUILD_EXTMOD to simplify building in-tree.
Currently we use the Make variable KBUILD_EXTMOD to distinguish between builds
inside the Linux kernel kbuild system and outside of it. However, if our
kernel modules are build inside a kernel tree as part of a kernel build this
does not work, as they are no longer external modules. So replace those
checks with checks against KERNELRELEASE, and remove other uses of the
variable while we are at it. Said other uses are inside the host module
top-level Make file. I am not actually aware of any users of this file,
though if we ever build those modules as part of a kernel build it might be
useful.

Location:

trunk/src/VBox

Files:

• Additions/linux/Makefile (modified) (2 diffs)
• HostDrivers/linux/Makefile (modified) (2 diffs)
• Installer/linux/Makefile-header.gmk (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile

@@ -15 +15 @@
 #
 
-ifneq ($(KBUILD_EXTMOD),)
+ifneq ($(KERNELRELEASE),)
 
-# Building from kBuild (make -C <kernel_directory> M=`pwd`).
-# KBUILD_EXTMOD is set to $(M) in this case.
+# Building from kBuild (make -C <kernel_directory> M=`pwd`)
+# or inside a kernel source tree.
 
 obj-m = vboxguest/ vboxsf/ vboxvideo/
 
-else # ! KBUILD_EXTMOD
+else # ! KERNELRELEASE
 
 KBUILD_VERBOSE =
@@ -108 +108 @@
 .PHONY: vboxguest vboxsf vboxvideo all install clean check load
 
-endif # ! KBUILD_EXTMOD
+endif # ! KERNELRELEASE

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -24 +24 @@
 #
 
-ifneq ($(KBUILD_EXTMOD),)
+ifneq ($(KERNELRELEASE),)
 
-# Building from kBuild (make -C <kernel_directory> M=`pwd`).
-# KBUILD_EXTMOD is set to $(M) in this case.
+# Building from kBuild (make -C <kernel_directory> M=`pwd`),
+# or inside a kernel source tree.
 
 obj-m = vboxdrv/
-ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
+ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
  obj-m += vboxnetflt/
 endif
-ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
+ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
  obj-m += vboxnetadp/
 endif
-ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
  obj-m += vboxpci/
 endif
 
-else # ! KBUILD_EXTMOD
+else # ! KERNELRELEASE
 
-# convenience Makefile without KBUILD_EXTMOD
+# convenience Makefile without KERNELRELEASE
 
 KBUILD_VERBOSE ?=
@@ -147 +147 @@
         done
 
-endif # ! KBUILD_EXTMOD
+endif # ! KERNELRELEASE

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

@@ -188 +188 @@
 INSTALL_MOD_DIR ?= misc
 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 CURDIR # for make < v3.79
- CURDIR := $(shell pwd)
-endif
-ifndef KBUILD_EXTMOD
- KBUILD_EXTMOD := $(CURDIR)
-endif
-
 
 # For VBOX_GCC_CHECK_CC
@@ -240 +226 @@
 $(warning dbg: KERN_VERSION     = $(KERN_VERSION))
 $(warning dbg: MODULE_DIR       = $(MODULE_DIR))
-$(warning dbg: KBUILD_EXTMOD    = $(KBUILD_EXTMOD))
 $(warning dbg: VBOX_MODULE_SRC_DIR = $(VBOX_MODULE_SRC_DIR))
  endif