儲存庫 vbox 的更動 45135

時間撮記:

2013-3-22 上午09:59:17 (12 年 以前)

作者:

vboxsync

訊息:

Additions/linux: automatically package and install versions of vboxvideo_drv.so for X.Org Server 1.12 and later.

位置:

trunk/src/VBox/Additions/linux

檔案:

• Makefile.kmk (修改) (1 筆差異)
• installer/vboxadd-x11.sh (修改) (3 筆差異)

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

@@ -145 +145 @@
         vboxmouse_drv_15.so \
         vboxmouse_drv_16.so \
-        vboxvideo_drv_70.so \
-        vboxvideo_drv_71.so \
-        vboxvideo_drv_13.so \
-        vboxvideo_drv_14.so \
-        vboxvideo_drv_15.so \
-        vboxvideo_drv_16.so \
-        vboxvideo_drv_17.so \
-        vboxvideo_drv_18.so \
-        vboxvideo_drv_19.so \
-        vboxvideo_drv_110.so \
-        vboxvideo_drv_111.so \
-        vboxvideo_drv_112.so \
-        vboxvideo_drv_113.so \
+        $(foreach file,$(wildcard $(PATH_STAGE_BIN)/additions/vboxvideo_drv_*),\
+                $(notdir $(file))) \
         $(if $(VBOX_WITH_PAM),pam_vbox.so,) \
         mount.vboxsf

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

@@ -55 +55 @@
 xver=`X -version 2>&1`
 x_version=`echo "$xver" | sed -n 's/^X Window System Version \([0-9.]\+\)/\1/p'``echo "$xver" | sed -n 's/^XFree86 Version \([0-9.]\+\)/\1/p'``echo "$xver" | sed -n 's/^X Protocol Version 11, Revision 0, Release \([0-9.]\+\)/\1/p'``echo "$xver" | sed -n 's/^X.Org X Server \([0-9.]\+\)/\1/p'`
+x_version_short=`echo "${x_version}" | sed 's/\([0-9]*\.[0-9]*\)\..*/\1/'`
 # Version of Redhat or Fedora installed.  Needed for setting up selinux policy.
 redhat_release=`cat /etc/redhat-release 2> /dev/null`
@@ -329 +330 @@
             dox11config=""
             ;;
-        1.13.* )
-            xserver_version="X.Org Server 1.13"
-            vboxvideo_src=vboxvideo_drv_113.so
-            setupxorgconf=""
-            ;;
-        1.12.* )
-            xserver_version="X.Org Server 1.12"
-            vboxvideo_src=vboxvideo_drv_112.so
-            setupxorgconf=""
-            ;;
         1.11.* )
             xserver_version="X.Org Server 1.11"
@@ -421 +412 @@
             ;;
         * )
-            echo "Warning: unknown version of the X Window System installed.  Not installing"
-            echo "X Window System drivers."
-            dox11config=""
+            # Anything else, including all X server versions as of 1.12.
+            xserver_version="X.Org Server ${x_version_short}"
+            vboxvideo_src=vboxvideo_drv_`echo ${x_version_short} | sed 's/\.//'`.so
+            setupxorgconf=""
+            test -f "${lib_dir}/${vboxvideo_src}" ||
+            {
+                echo "Warning: unknown version of the X Window System installed.  Not installing"
+                echo "X Window System drivers."
+                dox11config=""
+                vboxvideo_src=""
+            }
             ;;
     esac
-    begin "Installing $xserver_version modules"
+    test -n "${dox11config}" &&
+        begin "Installing $xserver_version modules"
     rm "$modules_dir/drivers/vboxvideo_drv$driver_ext" 2>/dev/null
     rm "$modules_dir/input/vboxmouse_drv$driver_ext" 2>/dev/null