[oe-commits] Richard Purdie : formfactor: Clean up errors on machines without framebuffers

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f5c39ea822b440ae4bdd38be94fcf8a2814d2229
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f5c39ea822b440ae4bdd38be94fcf8a2814d2229

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Aug 20 16:44:36 2012 +0100

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-bsp/formfactor/files/config      |   22 ++++++++++++----------
 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 a3f762a..41066de 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 31b4490..69c58f2 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}"