summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2006-10-03 10:39:24 +0000
committerMatthew Allum <mallum@openedhand.com>2006-10-03 10:39:24 +0000
commit6553a20a49bf3c380c95a9bfccf4e1ebe10ed847 (patch)
tree1db4f1988d032e245170510c86de77d2d0f0dd8b /meta/packages
parent0be2426abf97e976c64c3c7339bc8025c03e3509 (diff)
downloadpoky-6553a20a49bf3c380c95a9bfccf4e1ebe10ed847.tar.gz
Add XServer fallback settings for unknown machine
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@786 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver15
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index ad05353351..8828f60434 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -18,6 +18,14 @@ fi
18 18
19. /etc/profile 19. /etc/profile
20 20
21fallback_screen_arg() {
22 geom=`fbset | grep geometry`
23 w=`echo $geom | awk '{ print $2 }'`
24 h=`echo $geom | awk '{ print $3 }'`
25 b=`echo $geom | awk '{ print $6 }'`
26 echo -n "${w}x${h}x${b}"
27}
28
21module_id() { 29module_id() {
22 ## used to read from assets, but sometimes assets is corrupted 30 ## used to read from assets, but sometimes assets is corrupted
23 # grep "Module ID" /proc/hal/assets | sed "s/.*://" 31 # grep "Module ID" /proc/hal/assets | sed "s/.*://"
@@ -75,6 +83,13 @@ case `module_id` in
75 modprobe mbxfb 83 modprobe mbxfb
76 ARGS="$ARGS -fb /dev/fb1" 84 ARGS="$ARGS -fb /dev/fb1"
77 ;; 85 ;;
86 *)
87 # Its a device we dont know about - in which case force
88 # kdrive to use the current framebuffer geometry otherwise
89 # it will defualt to trying to achieve 1024x768
90 S=`fallback_screen_arg`
91 ARGS="$ARGS -screen $S"
92 ;;
78esac 93esac
79 94
80DISPLAY=':0' 95DISPLAY=':0'
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index bccd58a220..c076a3435a 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
5PR = "r8" 5PR = "r9"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}