Changeset 36388 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2011 9:28:16 AM (14 years ago)

Author:

vboxsync

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

70740

Message:

Additions/x11: do not build or install drivers for pre-release server versions

Location:

trunk/src/VBox/Additions

Files:

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

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

@@ -136 +136 @@
         vboxmouse_drv_18.so \
         vboxmouse_drv_19.so \
-        vboxmouse_drv_110rc.so \
         vboxmouse_drv_110.so \
         vboxvideo_drv_70.so \
@@ -147 +146 @@
         vboxvideo_drv_18.so \
         vboxvideo_drv_19.so \
-        vboxvideo_drv_110rc.so \
         vboxvideo_drv_110.so \
         pam_vbox.so \

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

@@ -320 +320 @@
     fi
     case $x_version in
-        1.10.99.* )
+        1.*.99.* )
             echo "Warning: unsupported pre-release version of X.Org Server installed.  Not"
             echo "installing the X.Org drivers."
@@ -333 +333 @@
             # test "$system" = "redhat" || setupxorgconf=""
             ;;
-        1.9.99.901 )
-            echo "Warning: you are using a pre-release version of X.Org server 1.5 which is known"
-            echo "not to work with the VirtualBox Guest Additions.  Please update to a more"
-            echo "recent version (for example by installing all updates in your guest) and then"
-            echo "set up the Guest Additions for X.Org server by running"
-            echo ""
-            echo "  /usr/lib[64]/VBoxGuestAdditions/vboxadd-x11 setup"
-            dox11config=""
-            ;;
-        1.9.99.* )
-            begin "Installing X.Org Server 1.10rc modules"
-            vboxvideo_src=vboxvideo_drv_110rc.so
-            vboxmouse_src=vboxmouse_drv_110rc.so
-            doxorgconfd="true"
-            # Does Fedora still ship without vboxvideo detection?
-            # test "$system" = "redhat" || setupxorgconf=""
-            ;;
-        1.8.99.* | 1.9.* )
+        1.9.* )
             begin "Installing X.Org Server 1.9 modules"
             vboxvideo_src=vboxvideo_drv_19.so
@@ -358 +341 @@
             # test "$system" = "redhat" || setupxorgconf=""
             ;;
-        1.7.99.* | 1.8.* )
+        1.8.* )
             begin "Installing X.Org Server 1.8 modules"
             vboxvideo_src=vboxvideo_drv_18.so
@@ -366 +349 @@
             test "$system" = "redhat" || setupxorgconf=""
             ;;
-        1.6.99.* | 1.7.* )
+        1.7.* )
             begin "Installing X.Org Server 1.7 modules"
             vboxvideo_src=vboxvideo_drv_17.so
@@ -373 +356 @@
             test "$system" = "debian" && doxorgconfd="true"
             ;;
-        1.5.99.* | 1.6.* )
+        1.6.* )
             begin "Installing X.Org Server 1.6 modules"
             vboxvideo_src=vboxvideo_drv_16.so
@@ -380 +363 @@
             test "$system" = "suse" && setupxorgconf=""
             ;;
-        1.4.99.901 | 1.4.99.902 )
-            echo "Warning: you are using a pre-release version of X.Org server 1.5 which is known"
-            echo "not to work with the VirtualBox Guest Additions.  Please update to a more"
-            echo "recent version (for example by installing all updates in your guest) and then"
-            echo "set up the Guest Additions for X.Org server by running"
-            echo ""
-            echo "  /usr/lib[64]/VBoxGuestAdditions/vboxadd-x11 setup"
-            dox11config=""
-            ;;
-        1.4.99.* | 1.5.* )
+        1.5.* )
             # Fedora 9 shipped X.Org Server version 1.4.99.9x (1.5.0 RC)
             # in its released version

trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

@@ -216 +216 @@
 
 #
-# vboxmouse_drv_110rc
-#
-DLLS += vboxmouse_drv_110rc
-vboxmouse_drv_110rc_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxmouse_drv_110rc_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-vboxmouse_drv_110rc_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.99.901+git20110131.be3be758 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-        $(PATH_SUB_CURRENT)
-vboxmouse_drv_110rc_SOURCES = \
-        vboxmouse_15.c
-
-
-#
 # vboxmouse_drv_110
 #

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -300 +300 @@
 
 #
-# vboxvideo_drv_110rc
-#
-DLLS += vboxvideo_drv_110rc
-vboxvideo_drv_110rc_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxvideo_drv_110rc_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_110rc_DEFS := $(vboxvideo_drv_15_DEFS)
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-vboxvideo_drv_110rc_INCS = \
-        $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
-        $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
-        $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
-        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.99.901+git20110131.be3be758 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
-vboxvideo_drv_110rc_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_110rc_SOURCES := $(vboxvideo_drv_15_SOURCES)
-
-
-#
 # vboxvideo_drv_110
 #