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 | |
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>
-rwxr-xr-x | meta-cedartrail/README | 15 | ||||
-rw-r--r-- | meta-cedartrail/conf/machine/cedartrail.conf | 3 | ||||
-rw-r--r-- | meta-chiefriver/README | 15 | ||||
-rw-r--r-- | meta-chiefriver/conf/machine/chiefriver.conf | 3 | ||||
-rw-r--r-- | meta-crownbay/README | 15 | ||||
-rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 3 | ||||
-rw-r--r-- | meta-fri2/README | 15 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 3 | ||||
-rw-r--r-- | meta-sugarbay/README | 15 | ||||
-rw-r--r-- | meta-sugarbay/conf/machine/sugarbay.conf | 3 | ||||
-rw-r--r-- | meta-sys940x/README | 15 | ||||
-rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 3 |
12 files changed, 102 insertions, 6 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}" |
diff --git a/meta-chiefriver/README b/meta-chiefriver/README index 49e44613..438c2930 100644 --- a/meta-chiefriver/README +++ b/meta-chiefriver/README | |||
@@ -60,6 +60,21 @@ At the end of a successful build, you should have a live image that | |||
60 | you can boot from a USB flash drive (see instructions on how to do | 60 | you can boot from a USB flash drive (see instructions on how to do |
61 | that below, in the section 'Booting the images from /binary'). | 61 | that below, in the section 'Booting the images from /binary'). |
62 | 62 | ||
63 | NOTE: The 'chiefriver' machine will include support for hardware video | ||
64 | acceleration via gstreamer if and only if the "commercial" string is | ||
65 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
66 | |||
67 | For example: | ||
68 | |||
69 | LICENSE_FLAGS_WHITELIST = "commercial" | ||
70 | |||
71 | The reason this is needed is to prevent the image from including | ||
72 | anything that might violate the license terms of the packages used to | ||
73 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
74 | ffmpeg. As always, please consult the licenses included in the | ||
75 | specific packages for details if you use packages that require | ||
76 | particular LICENSE_FLAGS. | ||
77 | |||
63 | As an alternative to downloading the BSP tarball, you can also work | 78 | As an alternative to downloading the BSP tarball, you can also work |
64 | directly from the meta-intel git repository. For each BSP in the | 79 | directly from the meta-intel git repository. For each BSP in the |
65 | 'meta-intel' repository, there are multiple branches, one | 80 | 'meta-intel' repository, there are multiple branches, one |
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf index 6d8d3a56..a9c8e5ac 100644 --- a/meta-chiefriver/conf/machine/chiefriver.conf +++ b/meta-chiefriver/conf/machine/chiefriver.conf | |||
@@ -15,6 +15,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
15 | ${XSERVER_IA32_I965} \ | 15 | ${XSERVER_IA32_I965} \ |
16 | " | 16 | " |
17 | 17 | ||
18 | VA_FEATURES ?= "gst-va-intel va-intel" | 18 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
19 | "commercial", "gst-va-intel va-intel", "", d)}" | ||
19 | 20 | ||
20 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" | 21 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" |
diff --git a/meta-crownbay/README b/meta-crownbay/README index 25214326..f7aeffac 100644 --- a/meta-crownbay/README +++ b/meta-crownbay/README | |||
@@ -92,6 +92,21 @@ At the end of a successful build, you should have a live image that | |||
92 | you can boot from a USB flash drive (see instructions on how to do | 92 | you can boot from a USB flash drive (see instructions on how to do |
93 | that below, in the section 'Booting the images from /binary'). | 93 | that below, in the section 'Booting the images from /binary'). |
94 | 94 | ||
95 | NOTE: The 'crownbay' machine will include support for hardware video | ||
96 | acceleration via gstreamer if and only if the "commercial" string is | ||
97 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
98 | |||
99 | For example: | ||
100 | |||
101 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14 commercial" | ||
102 | |||
103 | The reason this is needed is to prevent the image from including | ||
104 | anything that might violate the license terms of the packages used to | ||
105 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
106 | ffmpeg. As always, please consult the licenses included in the | ||
107 | specific packages for details if you use packages that require | ||
108 | particular LICENSE_FLAGS. | ||
109 | |||
95 | As an alternative to downloading the BSP tarball, you can also work | 110 | As an alternative to downloading the BSP tarball, you can also work |
96 | directly from the meta-intel git repository. For each BSP in the | 111 | directly from the meta-intel git repository. For each BSP in the |
97 | 'meta-intel' repository, there are multiple branches, one | 112 | 'meta-intel' repository, there are multiple branches, one |
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index c4b7682d..40dbd1d1 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
@@ -23,6 +23,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | |||
23 | 23 | ||
24 | APPEND += "video=vesafb vga=0x318" | 24 | APPEND += "video=vesafb vga=0x318" |
25 | 25 | ||
26 | VA_FEATURES ?= "gst-va-intel va-intel" | 26 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
27 | "commercial", "gst-va-intel va-intel", "va-intel", d)}" | ||
27 | 28 | ||
28 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 29 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |
diff --git a/meta-fri2/README b/meta-fri2/README index 2208392f..a8661744 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 | |||
113 | you can boot from a USB flash drive (see instructions on how to do | 113 | you can boot from a USB flash drive (see instructions on how to do |
114 | that below, in the section 'Booting the images from /binary'). | 114 | that below, in the section 'Booting the images from /binary'). |
115 | 115 | ||
116 | NOTE: The 'fri2' machine will include support for hardware video | ||
117 | acceleration via gstreamer if and only if the "commercial" string is | ||
118 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
119 | |||
120 | For example: | ||
121 | |||
122 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial" | ||
123 | |||
124 | The reason this is needed is to prevent the image from including | ||
125 | anything that might violate the license terms of the packages used to | ||
126 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
127 | ffmpeg. As always, please consult the licenses included in the | ||
128 | specific packages for details if you use packages that require | ||
129 | particular LICENSE_FLAGS. | ||
130 | |||
116 | As an alternative to downloading the BSP tarball, you can also work | 131 | As an alternative to downloading the BSP tarball, you can also work |
117 | directly from the meta-intel git repository. For each BSP in the | 132 | directly 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 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 | |||
8 | require conf/machine/include/ia32-base.inc | 8 | require conf/machine/include/ia32-base.inc |
9 | require conf/machine/include/meta-intel.inc | 9 | require conf/machine/include/meta-intel.inc |
10 | 10 | ||
11 | VA_FEATURES ?= "gst-va-intel va-intel" | 11 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
12 | "commercial", "gst-va-intel va-intel", "va-intel", d)}" | ||
12 | 13 | ||
13 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" | 14 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
14 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 15 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |
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 | |||
71 | you can boot from a USB flash drive (see instructions on how to do | 71 | you can boot from a USB flash drive (see instructions on how to do |
72 | that below, in the section 'Booting the images from /binary'). | 72 | that below, in the section 'Booting the images from /binary'). |
73 | 73 | ||
74 | NOTE: The 'sugarbay' machine will include support for hardware video | ||
75 | acceleration via gstreamer if and only if the "commercial" string is | ||
76 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
77 | |||
78 | For example: | ||
79 | |||
80 | LICENSE_FLAGS_WHITELIST = "commercial" | ||
81 | |||
82 | The reason this is needed is to prevent the image from including | ||
83 | anything that might violate the license terms of the packages used to | ||
84 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
85 | ffmpeg. As always, please consult the licenses included in the | ||
86 | specific packages for details if you use packages that require | ||
87 | particular LICENSE_FLAGS. | ||
88 | |||
74 | As an alternative to downloading the BSP tarball, you can also work | 89 | As an alternative to downloading the BSP tarball, you can also work |
75 | directly from the meta-intel git repository. For each BSP in the | 90 | directly 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 | ||
19 | VA_FEATURES ?= "gst-va-intel va-intel" | 19 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
20 | "commercial", "gst-va-intel va-intel", "", d)}" | ||
20 | 21 | ||
21 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 22 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |
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 | |||
96 | you can boot from a USB flash drive (see instructions on how to do | 96 | you can boot from a USB flash drive (see instructions on how to do |
97 | that below, in the section 'Booting the images from /binary'). | 97 | that below, in the section 'Booting the images from /binary'). |
98 | 98 | ||
99 | NOTE: The 'sys940x' machine will include support for hardware video | ||
100 | acceleration via gstreamer if and only if the "commercial" string is | ||
101 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
102 | |||
103 | For example: | ||
104 | |||
105 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial" | ||
106 | |||
107 | The reason this is needed is to prevent the image from including | ||
108 | anything that might violate the license terms of the packages used to | ||
109 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
110 | ffmpeg. As always, please consult the licenses included in the | ||
111 | specific packages for details if you use packages that require | ||
112 | particular LICENSE_FLAGS. | ||
113 | |||
99 | As an alternative to downloading the BSP tarball, you can also work | 114 | As an alternative to downloading the BSP tarball, you can also work |
100 | directly from the meta-intel git repository. For each BSP in the | 115 | directly 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" | |||
25 | SERIAL_CONSOLE = "115200 ttyS0" | 25 | SERIAL_CONSOLE = "115200 ttyS0" |
26 | APPEND += "console=ttyS0,115200 console=tty0" | 26 | APPEND += "console=ttyS0,115200 console=tty0" |
27 | 27 | ||
28 | VA_FEATURES ?= "gst-va-intel va-intel" | 28 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
29 | "commercial", "gst-va-intel va-intel", "va-intel", d)}" | ||
29 | 30 | ||
30 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 31 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |