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:14 -0800 |
commit | 3f6ed2c850cac41f40aa3f3fe8ae7832668c1e45 (patch) | |
tree | 6fd07a1043a3a340d2e27ab11efac155f1b3b0fa /meta/recipes-bsp | |
parent | e189a7113ca44eb202d1da8139678ba9729286b4 (diff) | |
download | poky-3f6ed2c850cac41f40aa3f3fe8ae7832668c1e45.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]
(From OE-Core rev: fb2df75e1552e60c67449c06cd80accc40ea534e)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-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 | |||
29 | fi | 29 | fi |
30 | 30 | ||
31 | if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then | 31 | if [ -z "$DISPLAY_WIDTH_PIXELS" ]; then |
32 | DISPLAY_WIDTH_PIXELS=`fbset | grep geometry | awk '{ print $2 }'` | 32 | DISPLAY_WIDTH_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $2 }'` |
33 | fi | 33 | fi |
34 | 34 | ||
35 | if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then | 35 | if [ -z "$DISPLAY_HEIGHT_PIXELS" ]; then |
36 | DISPLAY_HEIGHT_PIXELS=`fbset | grep geometry | awk '{ print $3 }'` | 36 | DISPLAY_HEIGHT_PIXELS=`/usr/sbin/fbset | grep geometry | awk '{ print $3 }'` |
37 | fi | 37 | fi |
38 | 38 | ||
39 | if [ -z "$DISPLAY_BPP" ]; then | 39 | if [ -z "$DISPLAY_BPP" ]; then |
40 | DISPLAY_BPP=`fbset | grep geometry | awk '{ print $6 }'` | 40 | DISPLAY_BPP=`/usr/sbin/fbset | grep geometry | awk '{ print $6 }'` |
41 | fi | 41 | fi |
42 | 42 | ||
43 | # | 43 | # |
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" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | PR = "r19" | 6 | PR = "r20" |
7 | 7 | ||
8 | SRC_URI = "file://config file://machconfig" | 8 | SRC_URI = "file://config file://machconfig" |
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |