mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-17 12:49:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

x11-common: just support Xorg now that kdrive has been removed

Browse Source 
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>
This commit is contained in:
Ross Burton
2012-08-29 17:44:27 +01:00
committed by Richard Purdie
parent dbc8cc458b
commit aa212d2b25
2 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
View File

@@ -1,53 +1,12 @@
#!/bin/sh #!/bin/sh
# #
# note xinit needs full server path XSERVER=/usr/bin/Xorg
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
. /etc/profile . /etc/profile
ARGS=" -br -pn" 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' DISPLAY=':0'
exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*

2
meta/recipes-graphics/x11-common/x11-common_0.1.bb
View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and configuration files"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11" SECTION = "x11"
PR = "r45" PR = "r46"
SRC_URI = "file://etc \ SRC_URI = "file://etc \
file://gplv2-license.patch" file://gplv2-license.patch"