summaryrefslogtreecommitdiffstats
path: root/meta-sys940x/conf/machine
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-09-14 19:07:34 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-09-15 20:02:17 (GMT)
commit2231d3800e94e39a6cc77473c6654cb221e7e55b (patch)
tree7d0ea5b2a6c8f41832a33dd501b4a76bf1688193 /meta-sys940x/conf/machine
parent164e0c7418229a38d7c97cd6bb3117a89869f6a4 (diff)
downloadmeta-intel-2231d3800e94e39a6cc77473c6654cb221e7e55b.tar.gz
meta-intel: make video acceleration choice dependent on LICENSE_FLAGS
The gst-ffmpeg recipe in oe-core had LICENSE_FLAGS added to make it "commercial", so to avoid build errors the BSPs that use it (via the gst-va-intel VA_FEATURE) should only include it if the user has added "commercial" to LICENSE_FLAGS_WHITELIST when building. This adds a conditional to detect that, along with a NOTE in the README to explain the need for the flag. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-sys940x/conf/machine')
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 9db2b2a..f71bb3a 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -25,6 +25,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
25SERIAL_CONSOLE = "115200 ttyS0" 25SERIAL_CONSOLE = "115200 ttyS0"
26APPEND += "console=ttyS0,115200 console=tty0" 26APPEND += "console=ttyS0,115200 console=tty0"
27 27
28VA_FEATURES ?= "gst-va-intel va-intel" 28VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
29 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
29 30
30MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 31MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"