summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/eglinfo
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-26 17:43:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:56 +0100
commit636cbfd8a8e733c1e54057f631b956c40370f595 (patch)
tree84e73edfd6f542d24b12b8d2f5a5e0287cc6ed76 /meta/recipes-graphics/eglinfo
parente8e3b62d6b9086a2147fa15c849b5a36ba1e9812 (diff)
downloadpoky-636cbfd8a8e733c1e54057f631b956c40370f595.tar.gz
eglinfo: drop machine-specific configuration from oe-core
eglinfo.inc has some board-specific EGLINFO_DEVICE settings but is missing the dependencies. Maintaining them for all supported devices in oe-core isn't scalable and this is trivially supported though a bbappend in each BSP layer. This was also causing problems compiling eglinfo on meta-yocto-bsp's beagleboard machine as the EGLINFO_DEVICE setting for beagleboard was telling it to use the closed GPU drivers, which are not supported in meta-yocto-bsp. [ YOCTO #5224 ] (From OE-Core rev: 2c1e147e61875054039ff08c36657c68c73037ee) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/eglinfo')
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb5
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo.inc11
2 files changed, 3 insertions, 13 deletions
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
index 65b265fcb7..455d31e872 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
@@ -1,11 +1,6 @@
1EGLINFO_PLATFORM ?= "fb" 1EGLINFO_PLATFORM ?= "fb"
2EGLINFO_BINARY_NAME ?= "eglinfo-fb" 2EGLINFO_BINARY_NAME ?= "eglinfo-fb"
3 3
4# .bbappend files in BSP meta layers can add EGLINFO_DEVICE
5# values if necessary. eglinfo.inc contains default values for
6# the currently supported devices.
7# Consult the eglinfo README.md for details
8
9include eglinfo.inc 4include eglinfo.inc
10 5
11SUMMARY += "(Framebuffer version)" 6SUMMARY += "(Framebuffer version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index d53d0ff21e..785e7f15f3 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -13,15 +13,10 @@ S = "${WORKDIR}/git"
13 13
14inherit waf 14inherit waf
15 15
16# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, 16# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which
17# which append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS 17# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set
18# not doing that here, since some platforms might not have OpenGL ES or OpenVG support 18# EGL_DEVICE as appropriate.
19# (in that case, the eglinfo build scripts automatically disable the relevant code paths)
20
21EGLINFO_DEVICE ?= "generic" 19EGLINFO_DEVICE ?= "generic"
22EGLINFO_DEVICE_raspberrypi ?= "raspberrypi"
23EGLINFO_DEVICE_beagleboard ?= "beagleboard"
24EGLINFO_DEVICE_mx6 ?= "imx6"
25 20
26EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ 21EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \
27 --device=${EGLINFO_DEVICE} \ 22 --device=${EGLINFO_DEVICE} \