[oe-commits] Paul Eggleton : formfactor: use full path to fbset

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Mar  6 23:55:37 2012 +0000

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]

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-bsp/formfactor/files/config      |    6 +++---
 meta/recipes-bsp/formfactor/formfactor_0.0.bb |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/formfactor/files/config b/meta/recipes-bsp/formfactor/files/config
index e936916..a3f762a 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 abf20e0..31b4490 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}"