diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-08-29 17:44:27 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:47:34 -0700 |
| commit | d81aaad65fa805d105cf4f261fd618cb6f2a5e79 (patch) | |
| tree | f52c68d96d0f71d24259d884099bbf2ca390b606 | |
| parent | 9af014091359b07c10afa3a04961bcbcfd74bc1e (diff) | |
| download | openembedded-core-d81aaad65fa805d105cf4f261fd618cb6f2a5e79.tar.gz openembedded-core-d81aaad65fa805d105cf4f261fd618cb6f2a5e79.tar.bz2 openembedded-core-d81aaad65fa805d105cf4f261fd618cb6f2a5e79.zip | |
x11-common: just support Xorg now that kdrive has been removed
This script was also handling Xomap, Xipaq and Xepson...
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver | 43 | ||||
| -rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 2 |
2 files changed, 2 insertions, 43 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 $* 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 26751458c9..6a04cfbeb3 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" |