summaryrefslogtreecommitdiffstats
path: root/meta-fri2/conf/machine
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-fri2/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-fri2/conf/machine')
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 56408f7e..bf7754fc 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}"