diff options
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver | 15 | ||||
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 |
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 | ||
21 | fallback_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 | |||
21 | module_id() { | 29 | module_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 | ;; | ||
78 | esac | 93 | esac |
79 | 94 | ||
80 | DISPLAY=':0' | 95 | DISPLAY=':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" | |||
2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
3 | SECTION = "x11" | 3 | SECTION = "x11" |
4 | RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" | 4 | RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" |
5 | PR = "r8" | 5 | PR = "r9" |
6 | 6 | ||
7 | SRC_URI = "file://etc" | 7 | SRC_URI = "file://etc" |
8 | S = ${WORKDIR} | 8 | S = ${WORKDIR} |