Changeset 59978 in vbox for trunk

Timestamp:

Mar 10, 2016 10:16:03 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: simplify handling of kernels too old to build vboxvideo by building a dummy module instead. This saves us some installer logic.

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/Makefile.module.kms (modified) (1 diff)
• drm/files_vboxvideo_drv (modified) (1 diff)
• drm/vbox_dummy.c (added)
• installer/vboxadd.sh (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -24 +24 @@
 MOD_NAME   = vboxvideo
 
+ifeq ($(filter 1.% 2.% 3.0.% 3.1.% 3.2.% 3.3.% 3.4.% 3.5.% 3.6.% 3.7.% \
+3.8.% 3.9.% 3.10.%,$(KERNELRELEASE)),)
 MOD_OBJS   = HGSMIBase.o HGSMICommon.o HGSMIMemAlloc.o heapoffset.o \
              Modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
              vbox_mode.o vbox_ttm.o VBVABase.o
+else
+MOD_OBJS   = vbox_dummy.o
+endif
 
 ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxvideo),)

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -60 +60 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.c=>vbox_drv.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.h=>vbox_drv.h \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_dummy.c=>vbox_dummy.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_fb.c=>vbox_fb.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_irq.c=>vbox_irq.c \

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

@@ -315 +315 @@
     fi
     succ_msg
-    if expr `uname -r` '<' '3.11' > /dev/null; then
-        echo "Not building the VirtualBox kernel graphics driver as this Linux version is"
-        echo "too old to use it."
-    else
-        begin "Building the graphics driver module"
-        if ! $BUILDINTMP \
-            --use-module-symvers /tmp/vboxguest-Module.symvers \
-            --module-source $MODULE_SRC/vboxvideo \
-            --no-print-directory install >> $LOG 2>&1; then
-            show_error "Building the graphics driver module failed.  Look at $LOG to find out what went wrong.  All other modules were built successfully."
-        else
-            succ_msg
-        fi
-    fi
+    begin "Building the graphics driver module"
+    if ! $BUILDINTMP \
+        --use-module-symvers /tmp/vboxguest-Module.symvers \
+        --module-source $MODULE_SRC/vboxvideo \
+        --no-print-directory install >> $LOG 2>&1; then
+        show_error "Look at $LOG to find out what went wrong"
+    fi
+    succ_msg
     depmod
     return 0