Changeset 28064 in vbox

Timestamp:

Apr 7, 2010 7:34:57 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: install the X.Org server 1.8 drivers, but do not activate them yet

Location:

trunk/src/VBox/Additions/linux

Files:

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

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

@@ -132 +132 @@
         vboxmouse_drv_16.so \
         vboxmouse_drv_17.so \
+        vboxmouse_drv_18.so \
         vboxvideo_drv_70.so \
         vboxvideo_drv_71.so \
@@ -139 +140 @@
         vboxvideo_drv_16.so \
         vboxvideo_drv_17.so \
+        vboxvideo_drv_18.so \
         pam_vbox.so \
         mount.vboxsf

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

@@ -317 +317 @@
     echo
     case $x_version in
-        1.7.99.* )
+        1.8.99.* )
             echo "Warning: unsupported pre-release version of X.Org Server installed.  Not"
             echo "installing the X.Org drivers."
             dox11config=""
             ;;
+        1.7.99.* | 1.8.* )
+            begin "Installing X.Org Server 1.8 modules"
+            vboxvideo_src=vboxvideo_drv_18.so
+            vboxmouse_src=vboxmouse_drv_18.so
+            setupxorgconf=""
+            ;;
         1.6.99.* | 1.7.* )
-            begin "Installing experimental X.Org Server 1.7 modules"
+            begin "Installing X.Org Server 1.7 modules"
             vboxvideo_src=vboxvideo_drv_17.so
             vboxmouse_src=vboxmouse_drv_17.so