diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-20 16:44:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 12:15:30 +0100 |
| commit | ec102f50704dff85db11a808a10a3ff5bcb76041 (patch) | |
| tree | 167b2a20b4e79b678552f87a5e0aa58810eb6a2e /meta/recipes-bsp/formfactor | |
| parent | 48619958d53cbec888a0a6806c5e494291e9e227 (diff) | |
| download | openembedded-core-contrib-ec102f50704dff85db11a808a10a3ff5bcb76041.tar.gz | |
formfactor: Clean up errors on machines without framebuffers
If fbset can't find a framebuffer we end up with a mess on the console.
We might as well avoid doing this on machines without a framebuffer.
(From OE-Core rev: f5c39ea822b440ae4bdd38be94fcf8a2814d2229)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/formfactor')
| -rwxr-xr-x | meta/recipes-bsp/formfactor/files/config | 22 | ||||
| -rw-r--r-- | meta/recipes-bsp/formfactor/formfactor_0.0.bb | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-bsp/formfactor/files/config b/meta/recipes-bsp/formfactor/files/config index a3f762a0f1..41066def97 100755 --- a/meta/recipes-bsp/formfactor/files/config +++ b/meta/recipes-bsp/formfactor/files/config @@ -28,16 +28,18 @@ if [ -z "$DISPLAY_ORIENTATION" ]; then DISPLAY_ORIENTATION=0 fi -if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then - DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'` -fi - -if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then - DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'` -fi - -if [ -z "$DISPLAY_BPP" ]; then - DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'` +if [ -e "/dev/fb" ]; then + if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then + DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'` + fi + + if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then + DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'` + fi + + if [ -z "$DISPLAY_BPP" ]; then + DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'` + fi fi # diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb index 31b4490d15..69c58f22e9 100644 --- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb +++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r20" +PR = "r21" SRC_URI = "file://config file://machconfig" S = "${WORKDIR}" |