Changeset 74412 in vbox

Timestamp:

Sep 21, 2018 4:47:56 PM (7 years ago)

Author:

vboxsync

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

125247

Message:

Additions/linux: remove attempt to suppress a log message.
The build logs for kernel modules start with a test for autoconf.h which
includes the text of an error message in the text. This historically confused
users who thought it was a real error, so we tried to suppress it from our
logs, but the egrep command failed on Ubuntu 14.04. Since though we now only
include the build log in case of error anyway there is no longer a risk that
users will think that a successful build failed, so just remove the
suppression.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (4 diffs)

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

@@ -131 +131 @@
 module_build_log()
 {
-    setup_log
-    echo "${1}" | egrep -v \
-        "^test -e include/generated/autoconf.h|^echo >&2|^/bin/false)$" \
-        >> "${LOG}"
+    log "Error building the module.  Build output follows."
+    echo ""
+    echo "${1}" >> "${LOG}"
 }
 
@@ -345 +344 @@
         --no-print-directory install 2>&1`; then
         # If check_module_dependencies.sh fails it prints a message itself.
-        log "Error building the module:"
         module_build_log "$myerr"
         "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
@@ -356 +354 @@
         --module-source $MODULE_SRC/vboxsf \
         --no-print-directory install 2>&1`; then
-        log "Error building the module:"
         module_build_log "$myerr"
         info  "Look at $LOG to find out what went wrong"
@@ -366 +363 @@
         --module-source $MODULE_SRC/vboxvideo \
         --no-print-directory install 2>&1`; then
-        log "Error building the module:"
         module_build_log "$myerr"
         info "Look at $LOG to find out what went wrong"