Changeset 70497 in vbox for trunk

Timestamp:

Jan 9, 2018 5:06:01 PM (7 years ago)

Author:

vboxsync

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

120112

Message:

configure: do not do kernel module test builds with --disable-kmods.
bugref:9088: Linux hosts: configure --disable-kmods requires kernel headers
As part of changes to make our kernel module test builds work with kernels
4.9 and later, kernel module test builds were moved from the main build
to test cases. The Make variables used to enable and disable them were also
changed, but configure --disable-kmods was not changed to reflect this.
This change fixes that and removes script from configure to disable test
builds with kernels 4.9 and later.
Thank you Ulrich Gemkow and Sérgio Basto.

File:

• trunk/configure (modified) (2 diffs)

trunk/configure

@@ -1767 +1767 @@
   else
     if test_execute; then
-      cat > $ODIR.tmp_src.c << EOF
-#include <linux/version.h>
-int printf(const char *format, ...);
-int main(void)
-{
-  return LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ? 1 : 0;
-}
-EOF
-      echo "compiling the following source file:" >> $LOG
-      cat $ODIR.tmp_src.c >> $LOG
-      echo "using the following command line:" >> $LOG
-      echo "$CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include " \
-          "-I$LINUX/include/generated/uapi" >> $LOG
-      $CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include \
-          -I$LINUX/include/generated/uapi >> $LOG 2>&1
-      if [ $? -eq 0 ]; then
-        $ODIR.tmp_out
-        if [ $? -ne 0 ]; then
-          cnf_append "VBOX_WITH_VBOXDRV" ""
-          cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
-          echo "Detected Linux >= 4.8 -- disabling compiling of Linux kernel modules."
-        else
-          cnf_append "VBOX_LINUX_SRC" "`cd $LINUX ; pwd`"
-        fi
-      fi
+      cnf_append "VBOX_LINUX_SRC" "`cd $LINUX ; pwd`"
     fi
   fi
@@ -2823 +2799 @@
   else
     cnf_append "VBOX_LINUX_SRC" ""
-    cnf_append "VBOX_WITH_VBOXDRV" ""
-    cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
+    cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
   fi
   if [ $ONLY_ADDITIONS -eq 0 ]; then