diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-06 23:55:37 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-08 12:18:09 -0800 |
| commit | fb2df75e1552e60c67449c06cd80accc40ea534e (patch) | |
| tree | fa456d2f103b9b8676476f01d1ab03fdd2496d0f | |
| parent | 7588a4f2e2728da0ff7a773b18527f3711b138f2 (diff) | |
| download | openembedded-core-contrib-fb2df75e1552e60c67449c06cd80accc40ea534e.tar.gz | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-bsp/formfactor/files/config | 6 | ||||
| -rw-r--r-- | 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 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}" |