diff options
Diffstat (limited to 'meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver')
| -rw-r--r-- | meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver | 43 |
1 files changed, 1 insertions, 42 deletions
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 cea733e9fb..73570dfeb5 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 $* |