Changeset 36603 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Apr 6, 2011 10:33:58 PM (14 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: removed the test kernel modules

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (1 diff)
• installer/Makefile.test (deleted)
• installer/Makefile.test.drm (deleted)
• installer/test.c (deleted)
• installer/test_drm.c (deleted)
• installer/vboxadd.sh (modified) (1 diff)

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

@@ -336 +336 @@
 
 #
-# Install the sources of our (sanity) test kernel module
-#
-INSTALLS += LnxAddTest-src
-LnxAddTest-src_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME))/test/
-LnxAddTest-src_MODE    = a+r,u+w
-LnxAddTest-src_SOURCES = \
-        $(VBOX_REL_LNX_ADD_INST)Makefile.test=>Makefile \
-        $(PATH_BIN)/additions/src/vboxguest/build_in_tmp \
-        $(VBOX_REL_LNX_ADD_INST)test.c
-
-
-#
-# Install the sources of our (sanity) test kernel rendering (DRM) module
-#
-INSTALLS += LnxAddDRM-src
-LnxAddDRM-src_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME))/test_drm/
-LnxAddDRM-src_MODE    = a+r,u+w
-LnxAddDRM-src_SOURCES = \
-        $(VBOX_REL_LNX_INST_SRC)Makefile.include.header \
-        $(VBOX_REL_LNX_INST_SRC)Makefile.include.footer \
-        $(VBOX_REL_LNX_ADD_INST)Makefile.test.drm=>Makefile \
-        $(PATH_BIN)/additions/src/vboxguest/build_in_tmp \
-        $(VBOX_REL_LNX_ADD_INST)test_drm.c
-
-
-#
 # We need our routines.sh and the uninstallation scripts in the staging
 # directory too

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

@@ -367 +367 @@
     test_sane_kernel_dir
 
-    if ! sh /usr/share/$PACKAGE/test/build_in_tmp \
-        --no-print-directory >> $LOG 2>&1; then
-        fail_msg
-        printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong.\nOnce you have corrected it, you can run\n\n  /etc/init.d/vboxadd setup\n\nto build them.\n\n"
-        return 1
-    else
-        if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
-            --no-print-directory >> $LOG 2>&1; then
-            printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem).  This Guest Additions feature will be disabled.\n\n"
-            BUILDVBOXVIDEO=""
-        fi
-    fi
     echo
+    if expr `uname -r` '<' '2.6.27' > /dev/null; then
+        echo "Not building the VirtualBox advanced graphics driver as this Linux version is"
+        echo "too old to use it."
+        BUILDVBOXVIDEO=
+    fi
     if [ -n "$BUILDVBOXGUEST" ]; then
         begin "Building the main Guest Additions module"