Changeset 38784 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2011 8:46:45 PM (13 years ago)

Author:

vboxsync

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

74079

Message:

Addition/linux: use the kernel mouse driver for all setups where we previously autoloaded vboxmouse

Location:

trunk/src/VBox/Additions

Files:

• linux/Makefile.kmk (modified) (2 diffs)
• linux/installer/70-xorg-vboxmouse.rules (deleted)
• linux/installer/90-vboxguest.fdi (deleted)
• linux/installer/vboxadd-x11.sh (modified) (14 diffs)
• x11/Installer/50-vboxmouse.conf (deleted)
• x11/vboxmouse/Makefile.kmk (modified) (4 diffs)

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

@@ -133 +133 @@
         vboxmouse_drv_15.so \
         vboxmouse_drv_16.so \
-        vboxmouse_drv_17.so \
-        vboxmouse_drv_18.so \
-        vboxmouse_drv_19.so \
-        vboxmouse_drv_110.so \
         vboxvideo_drv_70.so \
         vboxvideo_drv_71.so \
@@ -322 +318 @@
         $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
         $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
-        $(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \
-        $(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \
-        $(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \
         selinux-fedora/vbox_x11.pp \
         selinux-fedora/vbox_accel.pp

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

@@ -284 +284 @@
     # By default, we want to run our xorg.conf setup script
     setupxorgconf="true"
-    # But not to install the configuration file into xorg.conf.d
-    doxorgconfd=""
-    # But without the workaround for SUSE 11.1 not doing input auto-detection
-    newmouse=""
-    # By default we want to use hal/udev/whatever for auto-loading the mouse driver
+    # On all but the oldest X servers we want to use our new mouse
+    # driver.
+    newmouse="--newMouse"
+    # On more recent servers our kernel mouse driver will be used
+    # automatically
     automouse="--autoMouse"
     # We need to tell our xorg.conf hacking script whether /dev/psaux exists
@@ -329 +329 @@
             vboxvideo_src=vboxvideo_drv_110.so
             vboxmouse_src=vboxmouse_drv_110.so
-            doxorgconfd="true"
             # Does Fedora still ship without vboxvideo detection?
             # test "$system" = "redhat" || setupxorgconf=""
@@ -337 +336 @@
             vboxvideo_src=vboxvideo_drv_19.so
             vboxmouse_src=vboxmouse_drv_19.so
-            doxorgconfd="true"
             # Fedora 14 looks likely to ship without vboxvideo detection
             # test "$system" = "redhat" || setupxorgconf=""
@@ -345 +343 @@
             vboxvideo_src=vboxvideo_drv_18.so
             vboxmouse_src=vboxmouse_drv_18.so
-            doxorgconfd="true"
             # Fedora 13 shipped without vboxvideo detection
             test "$system" = "redhat" || setupxorgconf=""
@@ -354 +351 @@
             vboxmouse_src=vboxmouse_drv_17.so
             setupxorgconf=""
-            test "$system" = "debian" && doxorgconfd="true"
             ;;
         1.6.* )
@@ -364 +360 @@
             if grep -q -E '^SLE[^ ]' /etc/SuSE-brand 2>/dev/null; then
                 automouse=""
-                newmouse="--newMouse"
             else
                 test "$system" = "suse" && setupxorgconf=""
@@ -375 +370 @@
             # SUSE with X.Org 1.5 is another special case, and is also
             # handled specially
-            test "$system" = "suse" &&
-            { automouse=""; newmouse="--newMouse"; }
+            test "$system" = "suse" && automouse=""
             ;;
         1.4.* )
@@ -383 +377 @@
             vboxmouse_src=vboxmouse_drv_14.so
             automouse=""
-            newmouse="--newMouse"
             ;;
         1.3.* )
@@ -392 +385 @@
             vboxmouse_src=vboxmouse_drv_13.so
             automouse=""
-            newmouse="--newMouse"
             ;;
         7.1.* | 7.2.* )
@@ -399 +391 @@
             vboxmouse_src=vboxmouse_drv_71.so
             automouse=""
+            newmouse=""
             ;;
         6.9.* | 7.0.* )
@@ -405 +398 @@
             vboxmouse_src=vboxmouse_drv_70.so
             automouse=""
+            newmouse=""
             ;;
         6.7* | 6.8.* | 4.2.* | 4.3.* )
@@ -414 +408 @@
             ln -s "$lib_dir/vboxmouse_drv.o" "$modules_dir/input/vboxmouse_drv.o"
             automouse=""
+            newmouse=""
             succ_msg
             ;;
@@ -469 +464 @@
                 touch "$nobak"
             fi
-        fi
-        # X.Org Server versions starting with 1.5 can do mouse auto-detection,
-        # to make our lives easier and spare us the nasty hacks.
-        test -n "$automouse" &&
-            if [ -d /etc/hal/fdi/policy ]
-            then
-                # Install hal information about the mouse driver so that X.Org
-                # knows to load it.
-                install -o 0 -g 0 -m 0644 "$share_dir/90-vboxguest.fdi" /etc/hal/fdi/policy
-                # Delete the hal cache so that it notices our fdi file
-                rm -r /var/cache/hald/fdi-cache 2> /dev/null
-            fi
-        if test -n "$doxorgconfd"
-        then
-            if test -d /etc/udev/rules.d
-            then
-                install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d
-                # This is normally silent.  I have purposely not redirected
-                # error output as I want to know if something goes wrong,
-                # particularly if the command syntax ever changes.
-                udevadm trigger --action=change --subsystem-match=misc
-            fi
-            test -d /usr/share/X11/xorg.conf.d &&
-                install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/share/X11/xorg.conf.d
-            test -d /usr/lib/X11/xorg.conf.d &&
-                install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/lib/X11/xorg.conf.d
-            test -d /etc/X11/xorg.conf.d &&
-                install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /etc/X11/xorg.conf.d
         fi
         succ_msg
@@ -639 +606 @@
 
     # Remove other files
-    rm /etc/hal/fdi/policy/90-vboxguest.fdi 2>/dev/null
-    rm /etc/udev/rules.d/70-xorg-vboxmouse.rules 2>/dev/null
-    udevadm trigger --action=change --subsystem-match=misc 2>/dev/null
-    rm /usr/lib/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null
-    rm /usr/share/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null
     rm /usr/share/xserver-xorg/pci/vboxvideo.ids 2>/dev/null
 }

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

@@ -155 +155 @@
 
 
+ifneq ($(KBUILD_TARGET), linux)
+
 #
 # vboxmouse_drv_17
@@ -234 +236 @@
         vboxmouse_15.c
 
+endif # neq ($(KBUILD_TARGET),linux)
 
 # Check the undefined symbols in the X.Org modules against lists of allowed
@@ -302 +305 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+ifneq ($(KBUILD_TARGET), linux)
+
      TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
      OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
@@ -334 +339 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+endif # neq ($(KBUILD_TARGET),linux)
+
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
-  endif # eq ($(KBUILD_TARGET),linux)
+  endif # 1of ($(KBUILD_TARGET),linux solaris)
 # endif # ! VBOX_ONLY_ADDITIONS
 endif # VBOX_WITH_TESTCASES