Changeset 64718 in vbox

Timestamp:

Nov 19, 2016 5:00:04 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8530: Documentation: improve automated instructions for building kernel modules: make the Additions use check_module_dependencies.sh too. This should also greatly increase testing.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (1 diff)
• installer/vboxadd.sh (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -303 +303 @@
 lnx_add_inst-exec_EXEC_SOURCES  = \
         $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient \
-        $(VBOX_REL_X11_ADD_INST)x11config.sh
+        $(VBOX_REL_X11_ADD_INST)x11config.sh \
+        $(VBOX_REL_LNX_INST_SRC)check_module_dependencies.sh
 
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -316 +316 @@
         --module-source $MODULE_SRC/vboxguest \
         --no-print-directory install >> $LOG 2>&1; then
-        info "Look at $LOG to find out what went wrong"
+        # If check_module_dependencies.sh fails it prints a message itself.
+        "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
+            info "Look at $LOG to find out what went wrong"
         return 1
     fi
@@ -434 +436 @@
     else
         mod_succ=1
-        info "Please check that you have gcc, make, the header files for your Linux kernel and possibly perl installed."
     fi
     test -n "${QUICKSETUP}" && return "${mod_succ}"