summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-29 17:44:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:08 -0700
commitaa212d2b25438eeb5b4c11c2a9acf318733dcaf1 (patch)
treec677119bcc661717182fa8682c7ad8f6df978650
parentdbc8cc458bbdcde338b02281ef962b99635690b1 (diff)
downloadpoky-aa212d2b25438eeb5b4c11c2a9acf318733dcaf1.tar.gz
x11-common: just support Xorg now that kdrive has been removed
This script was also handling Xomap, Xipaq and Xepson... (From OE-Core rev: d81aaad65fa805d105cf4f261fd618cb6f2a5e79) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver43
-rw-r--r--meta/recipes-graphics/x11-common/x11-common_0.1.bb2
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 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3 3
4# note xinit needs full server path 4XSERVER=/usr/bin/Xorg
5XSERVER=/usr/bin/Xipaq
6if [ -f /usr/bin/Xfbdev ]; then
7 XSERVER=/usr/bin/Xfbdev
8fi
9if [ -f /usr/bin/Xepson ]; then
10 XSERVER=/usr/bin/Xepson
11fi
12if [ -f /usr/bin/Xorg ]; then
13 XSERVER=/usr/bin/Xorg
14fi
15if [ -f /usr/bin/Xomap ]; then
16 XSERVER=/usr/bin/Xomap
17fi
18 5
19. /etc/profile 6. /etc/profile
20 7
21ARGS=" -br -pn" 8ARGS=" -br -pn"
22 9
23if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
24
25 . /etc/formfactor/config
26
27 ARGS="$ARGS -keybd keyboard"
28
29 # use usb mouse if present
30 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
31 ARGS="$ARGS -mouse mouse,/dev/input/mice"
32 fi
33
34 # kdrive 1.4 onwards needs -mouse args
35 if [ -n "$TSLIB_TSDEVICE" ]; then
36 ARGS="$ARGS -mouse tslib"
37 fi
38
39 ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
40
41 if [ ! -z "$DISPLAY_DPI" ]; then
42 ARGS="$ARGS -dpi $DISPLAY_DPI"
43 fi
44
45 if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
46 ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
47 fi
48
49fi
50
51DISPLAY=':0' 10DISPLAY=':0'
52 11
53exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* 12exec 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"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4SECTION = "x11" 4SECTION = "x11"
5PR = "r45" 5PR = "r46"
6 6
7SRC_URI = "file://etc \ 7SRC_URI = "file://etc \
8 file://gplv2-license.patch" 8 file://gplv2-license.patch"