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

Timestamp:

Sep 8, 2017 3:11:42 PM (7 years ago)

Author:

vboxsync

Message:

Linux driver Make files: fix Linux 2.4 module installation.
bugref:4567: Linux kernel driver maintenance

The Guest Additions installer was no longer installing kernel modules on
Linux 2.4-based systems due to a path specification problem which was a
regression from recent clean-ups. Fix this and switch to taking a kernel
version rather than a kernel header path as a parameter for allowing builds
for different kernels.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.include.footer (modified) (1 diff)
• Makefile.include.header (modified) (2 diffs)

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

@@ -64 +64 @@
 install: $(MODULE)
         @mkdir -p $(MODULE_DIR); \
-        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) \
-        $(INSTALL_MOD_PATH)/$(KERN_DIR)/$(INSTALL_MOD_DIR); \
+        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
         PATH="$(PATH):/bin:/sbin" depmod -a;
 

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

@@ -91 +91 @@
 
  # kernel base directory
- ifndef KERN_DIR
-  KERN_DIR := /lib/modules/$(shell uname -r)/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. \
-                   Specify KERN_DIR=<directory> and run Make again)
-  endif
- else
-  ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-   $(error Error: KERN_DIR does not point to a directory)
-  endif
- endif
-
- # includes
- ifndef KERN_INCL
-  KERN_INCL := $(KERN_DIR)/include
- endif
- ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-  $(error Error: unable to find the include directory for your current Linux \
-                 kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
-
- # module install dir
- INSTALL_MOD_DIR ?= misc
+ KERN_VER ?= $(shell uname -r)
 
  # 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)
+ ifeq ($(shell if grep '"2\.4\.' /lib/modules/$(KERN_VER)/build/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
   KERN_VERSION := 24
  else
@@ -135 +113 @@
  endif
 
- KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
- KERN_INCL := $(KERN_DIR)/include
+ KERN_VER := $(KERNELRELEASE)
 
 endif # neq($(KERNELRELEASE),)
 
+# Kernel build folder
+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 headers of the Linux kernel to build against. \
+          Specify KERN_VER=<version> and run Make again)
+endif
+# Kernel include folder
+KERN_INCL := $(KERN_DIR)/include
+# module install folder
+INSTALL_MOD_DIR ?= misc
+MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
+
 # debug - show guesses.
 ifdef DEBUG
+$(warning dbg: INSTALL_MOD_PATH = $(INSTALL_MOD_PATH))
+$(warning dbg: INSTALL_MOD_DIR  = $(INSTALL_MOD_DIR))
 $(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: MODULE_DIR       = $(MODULE_DIR))
 endif