From 3f6ed2c850cac41f40aa3f3fe8ae7832668c1e45 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 6 Mar 2012 23:55:37 +0000 Subject: formfactor: use full path to fbset When using rootless X, /usr/sbin is not in PATH and thus running "fbset" will fail; so specify /usr/sbin/fbset instead. Fixes [YOCTO #1986] (From OE-Core rev: fb2df75e1552e60c67449c06cd80accc40ea534e) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-bsp/formfactor/files/config | 6 +++--- meta/recipes-bsp/formfactor/formfactor_0.0.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/formfactor/files/config b/meta/recipes-bsp/formfactor/files/config index e936916b43..a3f762a0f1 100755 --- a/meta/recipes-bsp/formfactor/files/config +++ b/meta/recipes-bsp/formfactor/files/config @@ -29,15 +29,15 @@ if [ -z "$DISPLAY_ORIENTATION" ]; then fi if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then - DISPLAY_WIDTH_PIXELS=`fbset | grep geometry | awk '{ print $2 }'` + DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'` fi if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then - DISPLAY_HEIGHT_PIXELS=`fbset | grep geometry | awk '{ print $3 }'` + DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'` fi if [ -z "$DISPLAY_BPP" ]; then - DISPLAY_BPP=`fbset | grep geometry | awk '{ print $6 }'` + DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'` fi # diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb index abf20e089e..31b4490d15 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 = "r19" +PR = "r20" SRC_URI = "file://config file://machconfig" S = "${WORKDIR}" -- cgit v1.2.3-54-g00ecf