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 <[email protected]> --- 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}" _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
