Changeset 68610 in vbox

Timestamp:

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

Author:

vboxsync

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

117834

Message:

Linux driver make files: reverted r117833.

Location:

trunk/src/VBox

Files:

• HostDrivers/linux/build_in_tmp (modified) (1 diff)
• Installer/linux/Makefile.include.footer (modified) (4 diffs)
• Installer/linux/Makefile.include.header (modified) (7 diffs)

trunk/src/VBox/HostDrivers/linux/build_in_tmp

@@ -65 +65 @@
 # make, cleanup if success
 cd "$tmpdir"
-if make "-j`echo ${MAKE_JOBS}`" "$@"; then  # strip leading space from "MAKE_JOBS"
+if make "-j${MAKE_JOBS}" "$@"; then
   if [ -n "$SAVE_MOD_SYMVERS" ]; then
     if [ -f Module.symvers ]; then

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

@@ -18 +18 @@
 override MODULE = $(MOD_NAME)
 OBJS   = $(MOD_OBJS)
+
+ifneq ($(MAKECMDGOALS),clean)
 
 KBUILD_VERBOSE ?= 1
@@ -42 +44 @@
 #
 
-# Note: while 2.4 kernels could also do "proper" builds from kbuild, the make
-# script needed to support it was somewhat different from 2.6.  Since this
-# script works and 2.4 is not a moving target we will not try do do things the
-# "proper" way.
-
 ifeq ($(BUILD_TARGET_ARCH),amd64)
  KFLAGS  += -mcmodel=kernel
@@ -62 +59 @@
 $(MODULE): $(MODULE).o
 
-install: $(MODULE)
-        @mkdir -p $(MODULE_DIR); \
-        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) \
-        $(INSTALL_MOD_PATH)/$(KERN_DIR)/$(INSTALL_MOD_DIR); \
-        PATH="$(PATH):/bin:/sbin" depmod -a;
-
-clean:
-        for f in $(sort $(dir $(OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .$(MOD_NAME)* .tmp_ver* $(MOD_NAME).* Modules.symvers modules.order
-
-else  # ! $(KERN_VERSION), 24
+else
 #
 # 2.6 and later
@@ -98 +85 @@
         $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) -j$(JOBS) modules
 
+modules_install:
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules_install
+
+endif
+
 install: $(MODULE)
-        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
+        @mkdir -p $(MODULE_DIR); \
+        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
+        PATH="$(PATH):/bin:/sbin" depmod -a;
 
-modules_install: install
-all: install
+endif # eq($(MAKECMDGOALS),clean)
 
 clean:
-        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
-
-.PHONY: $(MODULE) install modules_install clean
-endif
+        for f in $(MOD_CLEAN); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
+        rm -rf .$(MOD_NAME)* .tmp_ver* $(MOD_NAME).* Modules.symvers modules.order

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)