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>
This commit is contained in:
Richard Purdie 2012-08-20 16:44:36 +01:00
parent 48619958d5
commit ec102f5070
2 changed files with 11 additions and 9 deletions

View File

@ -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 [ -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_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 [ -z "$DISPLAY_BPP" ]; then
DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'`
fi
fi
#

View File

@ -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}"