Patchwork [5/6] x11-common: just support Xorg now that kdrive has been removed

login
register
mail settings
Submitter Ross Burton
Date Aug. 30, 2012, 5:07 p.m.
Message ID <bdb43140fcbd5c61c7698318dae74e9d03067bd5.1346346320.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/35561/
State Accepted
Commit d81aaad65fa805d105cf4f261fd618cb6f2a5e79
Headers show

Comments

Ross Burton - Aug. 30, 2012, 5:07 p.m.
This script was also handling Xomap, Xipaq and Xepson...

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../x11-common/x11-common/etc/X11/Xserver          |   43 +-------------------
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |    2 +-
 2 files changed, 2 insertions(+), 43 deletions(-)

Patch

diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
index cea733e..73570df 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
@@ -1,53 +1,12 @@ 
 #!/bin/sh
 #
 
-# note xinit needs full server path
-XSERVER=/usr/bin/Xipaq
-if [ -f /usr/bin/Xfbdev ]; then
-  XSERVER=/usr/bin/Xfbdev
-fi
-if [ -f /usr/bin/Xepson ]; then
-  XSERVER=/usr/bin/Xepson
-fi
-if [ -f /usr/bin/Xorg ]; then
-  XSERVER=/usr/bin/Xorg
-fi
-if [ -f /usr/bin/Xomap ]; then
-  XSERVER=/usr/bin/Xomap
-fi
+XSERVER=/usr/bin/Xorg
 
 . /etc/profile
 
 ARGS=" -br -pn"
 
-if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
-
-        . /etc/formfactor/config
-
-        ARGS="$ARGS -keybd keyboard"
-
-        # use usb mouse if present
-        if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
-          ARGS="$ARGS -mouse mouse,/dev/input/mice"
-        fi
-
-        # kdrive 1.4 onwards needs -mouse args
-        if [ -n "$TSLIB_TSDEVICE" ]; then
-          ARGS="$ARGS -mouse tslib"
-        fi
-
-        ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
-
-        if [ ! -z "$DISPLAY_DPI" ]; then
-                ARGS="$ARGS -dpi $DISPLAY_DPI"
-        fi
-
-        if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
-                ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
-        fi
-
-fi
-
 DISPLAY=':0'
 
 exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 2675145..6a04cfb 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "Common X11 scripts and configuration files"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r45"
+PR = "r46"
 
 SRC_URI = "file://etc \
            file://gplv2-license.patch"