summaryrefslogtreecommitdiffstats
path: root/meta-sys940x
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-09-14 14:07:34 -0500
committerTom Zanussi <tom.zanussi@intel.com>2012-09-15 15:02:17 -0500
commit2231d3800e94e39a6cc77473c6654cb221e7e55b (patch)
tree7d0ea5b2a6c8f41832a33dd501b4a76bf1688193 /meta-sys940x
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')
-rw-r--r--meta-sys940x/README15
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-sys940x/README b/meta-sys940x/README
index b030faf5..90589375 100644
--- a/meta-sys940x/README
+++ b/meta-sys940x/README
@@ -96,6 +96,21 @@ At the end of a successful build, you should have a live image that
96you can boot from a USB flash drive (see instructions on how to do 96you can boot from a USB flash drive (see instructions on how to do
97that below, in the section 'Booting the images from /binary'). 97that below, in the section 'Booting the images from /binary').
98 98
99NOTE: The 'sys940x' machine will include support for hardware video
100acceleration via gstreamer if and only if the "commercial" string is
101added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
102
103For example:
104
105 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial"
106
107The reason this is needed is to prevent the image from including
108anything that might violate the license terms of the packages used to
109implement the the video acceleration feature, such as gst-ffmpeg and
110ffmpeg. As always, please consult the licenses included in the
111specific packages for details if you use packages that require
112particular LICENSE_FLAGS.
113
99As an alternative to downloading the BSP tarball, you can also work 114As an alternative to downloading the BSP tarball, you can also work
100directly from the meta-intel git repository. For each BSP in the 115directly from the meta-intel git repository. For each BSP in the
101'meta-intel' repository, there are multiple branches, one 116'meta-intel' repository, there are multiple branches, one
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 9db2b2a4..f71bb3a8 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}"