summaryrefslogtreecommitdiffstats
path: root/meta-sugarbay
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-sugarbay
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-sugarbay')
-rw-r--r--meta-sugarbay/README15
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-sugarbay/README b/meta-sugarbay/README
index 413b2ab8..80833c1e 100644
--- a/meta-sugarbay/README
+++ b/meta-sugarbay/README
@@ -71,6 +71,21 @@ At the end of a successful build, you should have a live image that
71you can boot from a USB flash drive (see instructions on how to do 71you can boot from a USB flash drive (see instructions on how to do
72that below, in the section 'Booting the images from /binary'). 72that below, in the section 'Booting the images from /binary').
73 73
74NOTE: The 'sugarbay' machine will include support for hardware video
75acceleration via gstreamer if and only if the "commercial" string is
76added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
77
78For example:
79
80 LICENSE_FLAGS_WHITELIST = "commercial"
81
82The reason this is needed is to prevent the image from including
83anything that might violate the license terms of the packages used to
84implement the the video acceleration feature, such as gst-ffmpeg and
85ffmpeg. As always, please consult the licenses included in the
86specific packages for details if you use packages that require
87particular LICENSE_FLAGS.
88
74As an alternative to downloading the BSP tarball, you can also work 89As an alternative to downloading the BSP tarball, you can also work
75directly from the meta-intel git repository. For each BSP in the 90directly from the meta-intel git repository. For each BSP in the
76'meta-intel' repository, there are multiple branches, one 91'meta-intel' repository, there are multiple branches, one
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 616c2c5b..17cc15ca 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -16,6 +16,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
16 ${XSERVER_IA32_I965} \ 16 ${XSERVER_IA32_I965} \
17 " 17 "
18 18
19VA_FEATURES ?= "gst-va-intel va-intel" 19VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
20 "commercial", "gst-va-intel va-intel", "", d)}"
20 21
21MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 22MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"