summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/formfactor
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-20 15:44:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:15:30 (GMT)
commitec102f50704dff85db11a808a10a3ff5bcb76041 (patch)
tree167b2a20b4e79b678552f87a5e0aa58810eb6a2e /meta/recipes-bsp/formfactor
parent48619958d53cbec888a0a6806c5e494291e9e227 (diff)
downloadpoky-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-xmeta/recipes-bsp/formfactor/files/config22
-rw-r--r--meta/recipes-bsp/formfactor/formfactor_0.0.bb2
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
28 DISPLAY_ORIENTATION=0 28 DISPLAY_ORIENTATION=0
29fi 29fi
30 30
31if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then 31if [ -e "/dev/fb" ]; then
32 DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'` 32 if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then
33fi 33 DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'`
34 34 fi
35if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then 35
36 DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'` 36 if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then
37fi 37 DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'`
38 38 fi
39if [ -z "$DISPLAY_BPP" ]; then 39
40 DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'` 40 if [ -z "$DISPLAY_BPP" ]; then
41 DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'`
42 fi
41fi 43fi
42 44
43# 45#
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"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6PR = "r20" 6PR = "r21"
7 7
8SRC_URI = "file://config file://machconfig" 8SRC_URI = "file://config file://machconfig"
9S = "${WORKDIR}" 9S = "${WORKDIR}"