Changeset 80289 in vbox

Timestamp:

Aug 15, 2019 10:32:58 AM (6 years ago)

Author:

vboxsync

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

132744

Message:

Installers/Linux: Fix vboxvideo build breakage (exposed by previous fix to the special include path needed by this module) on some Debian and likely also Ubuntu kernels during sanity check compilation as part of the build. Our build passes KERN_DIR as such correctly through the environment and MAKEFLAGS, however it's not exactly what the kernel module build makefile expects and would correctly derive from its make command line specified variables. We use e.g. /lib/modules/4.9.0-3-amd64/build (which is a symlink to /usr/src/linux-headers-4.9.0-3-amd64) which is correct as such but due to the splitting of the kernel header package (which the kernel module build makefile knows how to deal with) it instead picks /usr/src/linux-headers-4.9.0-3-common if it's not overridden through the environment.

File:

• trunk/src/VBox/Installer/linux/Makefile-header.gmk (modified) (1 diff)

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

@@ -139 +139 @@
  ifeq ($(shell if grep '"[2]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
   export KERN_VER KERN_DIR
+ else
+  # This makefile received some variables in the command line which should
+  # not be passed to the recursive make invocations (of the Linux makefile
+  # for building kernel modules), since they should derive KERN_DIR from the
+  # respective command line variables to come up with the value they expect.
+  unexport KERN_VER KERN_DIR MAKEFLAGS
  endif