[oe-commits] Denis 'GNUtoo' Carikli : xserver-kdrive-common : Xserver: add support xorg for buglabs's bug 1.x an bump PR
git version control
git at git.openembedded.org
Sun Mar 28 16:19:38 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: c63b4066a5b2552a04e8a2e692931fc5fbb253c6
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c63b4066a5b2552a04e8a2e692931fc5fbb253c6
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date: Sun Mar 28 04:01:57 2010 +0200
xserver-kdrive-common : Xserver: add support xorg for buglabs's bug 1.x an bump PR
Handle the case where we have Xorg on a bug device
(kdrive support was not present and not added):
The bug device has 3 framebuffer devices nodes:
/dev/fb0 : 160x105 monochrome lcd screen, on bugbase
/dev/fb1 : 320x240 first color lcd screen (bug module)
/dev/fb2 : 320x240 second color lcd screen (bug module)
if we don't add this commit,Xserver would be running the following command
at the end:
xinit /etc/X11/Xsession -- /usr/bin/Xorg :0 -pn -screen 160x105x1
which will produce the following result for xorg:
(EE) No Screen section called "160x105x1"
(EE) Unable to determine the screen layout
(EE) Error parsing the config file
Fatal server error:
no screens found
Note that here "bug" is the machine defined in conf/machine/bug.conf
---
.../xserver-kdrive-common/Xserver | 4 ++++
.../xserver-kdrive-common_0.1.bb | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
index 386d285..e2566bb 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -166,6 +166,10 @@ case `module_id` in
# 32bpp - we'll enable it once newer kernels are.. working.
# ARGS="$ARGS -fbbpp32"
XSERVER=/usr/bin/Xorg ;;
+ "Bug-Labs BUG")
+ if [ "$XSERVER" = "/usr/bin/Xorg" ];then
+ ARGS=""
+ fi;; #TODO: handle kdrive
*)
# It is a device we do not know about, in which case we force
# kdrive to use the current framebuffer geometry -- otherwise
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 3812d2f..52a88b8 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
-PR = "r44"
+PR = "r45"
SRC_URI = "\
file://Xdefaults \
More information about the Openembedded-commits
mailing list