Changeset 68610 in vbox for trunk/src/VBox/Installer/linux/Makefile.include.header

Timestamp:

Sep 1, 2017 4:46:58 PM (7 years ago)

Author:

vboxsync

Message:

Linux driver make files: reverted r117833.

File:

• trunk/src/VBox/Installer/linux/Makefile.include.header (modified) (7 diffs)

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

@@ -16 +16 @@
 
 # Testing:
-# * Building with KERN_DIR set uses the value specified and
+# * Building with KERN_VER set to an installed but non-current kernel works and
+#   installs to the right location.
+# * Building with KERN_DIR and/or MODULE_DIR set uses the value specified and
 #   the default value for the unspecified one if any.
 
@@ -33 +35 @@
 # MOD_INCL = <any additional include paths which this module needs>
 # MOD_CFLAGS = <any additional CFLAGS which this module needs>
+# MOD_CLEAN = <list of directories that the clean target should look at>
 # include $(obj)/Makefile.include.footer
 #
@@ -84 +87 @@
 endif
 
+ifneq ($(MAKECMDGOALS),clean)
+
 ifeq ($(KERNELRELEASE),)
 
@@ -90 +95 @@
  #
 
+ # target kernel version
+ ifndef KERN_VER
+  KERN_VER := $(shell uname -r)
+ else
+  ifneq ($(shell if test -d /lib/modules/$(KERN_VER)/build; then echo yes; fi),yes)
+   KERN_VER := $(shell uname -r)
+  endif
+ endif
+
  # kernel base directory
  ifndef KERN_DIR
-  KERN_DIR := /lib/modules/$(shell uname -r)/build
+  KERN_DIR := /lib/modules/$(KERN_VER)/build
   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-   $(error Error: unable to find the sources of your current Linux kernel. \
+   KERN_DIR := /usr/src/linux
+   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
+    $(error Error: unable to find the sources of your current Linux kernel. \
                    Specify KERN_DIR=<directory> and run Make again)
+   endif
+   $(warning Warning: using /usr/src/linux as the source directory of your \
+                      Linux kernel. If this is not correct, specify \
+                      KERN_DIR=<directory> and run Make again.)
   endif
  else
@@ -105 +125 @@
  # includes
  ifndef KERN_INCL
-  KERN_INCL := $(KERN_DIR)/include
+  KERN_INCL = $(KERN_DIR)/include
  endif
  ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
@@ -112 +132 @@
  endif
 
- # module install dir
- INSTALL_MOD_DIR ?= misc
+ # module install dir, only for current kernel
+ ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
+  ifndef MODULE_DIR
+   MODULE_DIR_TST := /lib/modules/$(KERN_VER)
+   ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+    MODULE_DIR := $(MODULE_DIR_TST)/misc
+   else
+    $(error Unable to find the folder to install the module to)
+   endif
+  endif # MODULE_DIR unspecified
+ endif
 
- # guess kernel major version (24 or later)
- ifeq ($(shell if grep '"2\.4\.' $(KERN_INCL)/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
+ # guess kernel version (24 or 26)
+ ifeq ($(shell if grep '"2\.4\.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
   KERN_VERSION := 24
  else
@@ -135 +164 @@
  endif
 
- KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
- KERN_INCL := $(KERN_DIR)/include
-
 endif # neq($(KERNELRELEASE),)
 
 # debug - show guesses.
 ifdef DEBUG
-$(warning dbg: KERN_DIR         = $(KERN_DIR))
-$(warning dbg: KERN_INCL        = $(KERN_INCL))
-$(warning dbg: INSTALL_MOD_PATH = $(INSTALL_MOD_PATH))
-$(warning dbg: INSTALL_MOD_DIR  = $(INSTALL_MOD_DIR))
-$(warning dbg: KERN_VERSION     = $(KERN_VERSION))
+$(warning dbg: KERN_DIR     = $(KERN_DIR))
+$(warning dbg: KERN_INCL    = $(KERN_INCL))
+$(warning dbg: MODULE_DIR   = $(MODULE_DIR))
+$(warning dbg: KERN_VERSION = $(KERN_VERSION))
 endif
+
+endif # eq($(MAKECMDGOALS),clean)