diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-09-14 14:07:34 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-09-15 15:02:17 -0500 |
commit | 2231d3800e94e39a6cc77473c6654cb221e7e55b (patch) | |
tree | 7d0ea5b2a6c8f41832a33dd501b4a76bf1688193 /meta-cedartrail | |
parent | 164e0c7418229a38d7c97cd6bb3117a89869f6a4 (diff) | |
download | meta-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-cedartrail')
-rwxr-xr-x | meta-cedartrail/README | 15 | ||||
-rw-r--r-- | meta-cedartrail/conf/machine/cedartrail.conf | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-cedartrail/README b/meta-cedartrail/README index e47151e3..81a1260c 100755 --- a/meta-cedartrail/README +++ b/meta-cedartrail/README | |||
@@ -88,6 +88,21 @@ At the end of a successful build, you should have a live image that | |||
88 | you can boot from a USB flash drive (see instructions on how to do | 88 | you can boot from a USB flash drive (see instructions on how to do |
89 | that below, in the section 'Booting the images from /binary'). | 89 | that below, in the section 'Booting the images from /binary'). |
90 | 90 | ||
91 | NOTE: The 'cedartrail' machine will include support for hardware video | ||
92 | acceleration via gstreamer if and only if the "commercial" string is | ||
93 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
94 | |||
95 | For example: | ||
96 | |||
97 | LICENSE_FLAGS_WHITELIST = "license_cdv-pvr-driver_1.0.3 commercial" | ||
98 | |||
99 | The reason this is needed is to prevent the image from including | ||
100 | anything that might violate the license terms of the packages used to | ||
101 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
102 | ffmpeg. As always, please consult the licenses included in the | ||
103 | specific packages for details if you use packages that require | ||
104 | particular LICENSE_FLAGS. | ||
105 | |||
91 | As an alternative to downloading the BSP tarball, you can also work | 106 | As an alternative to downloading the BSP tarball, you can also work |
92 | directly from the meta-intel git repository. For each BSP in the | 107 | directly from the meta-intel git repository. For each BSP in the |
93 | 'meta-intel' repository, there are multiple branches, one | 108 | 'meta-intel' repository, there are multiple branches, one |
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf index cd9acd7c..33af0121 100644 --- a/meta-cedartrail/conf/machine/cedartrail.conf +++ b/meta-cedartrail/conf/machine/cedartrail.conf | |||
@@ -22,6 +22,7 @@ SYSLINUX_OPTS = "serial 0 115200" | |||
22 | SERIAL_CONSOLE = "115200 ttyS0" | 22 | SERIAL_CONSOLE = "115200 ttyS0" |
23 | APPEND += "console=ttyS0,115200 console=tty0" | 23 | APPEND += "console=ttyS0,115200 console=tty0" |
24 | 24 | ||
25 | VA_FEATURES ?= "gst-va-intel va-intel" | 25 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
26 | "commercial", "gst-va-intel va-intel", "", d)}" | ||
26 | 27 | ||
27 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 28 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |