summaryrefslogtreecommitdiffstats
path: root/meta-fri2
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-fri2
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-fri2')
-rw-r--r--meta-fri2/README15
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-fri2/README b/meta-fri2/README
index 2208392..a866174 100644
--- a/meta-fri2/README
+++ b/meta-fri2/README
@@ -113,6 +113,21 @@ At the end of a successful build, you should have a live image that
113you can boot from a USB flash drive (see instructions on how to do 113you can boot from a USB flash drive (see instructions on how to do
114that below, in the section 'Booting the images from /binary'). 114that below, in the section 'Booting the images from /binary').
115 115
116NOTE: The 'fri2' machine will include support for hardware video
117acceleration via gstreamer if and only if the "commercial" string is
118added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
119
120For example:
121
122 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial"
123
124The reason this is needed is to prevent the image from including
125anything that might violate the license terms of the packages used to
126implement the the video acceleration feature, such as gst-ffmpeg and
127ffmpeg. As always, please consult the licenses included in the
128specific packages for details if you use packages that require
129particular LICENSE_FLAGS.
130
116As an alternative to downloading the BSP tarball, you can also work 131As an alternative to downloading the BSP tarball, you can also work
117directly from the meta-intel git repository. For each BSP in the 132directly from the meta-intel git repository. For each BSP in the
118'meta-intel' repository, there are multiple branches, one 133'meta-intel' repository, there are multiple branches, one
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 56408f7..bf7754f 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,7 +8,8 @@ require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9require conf/machine/include/meta-intel.inc 9require conf/machine/include/meta-intel.inc
10 10
11VA_FEATURES ?= "gst-va-intel va-intel" 11VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
12 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
12 13
13MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" 14MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
14MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" 15MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"