summaryrefslogtreecommitdiffstats
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
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>
-rwxr-xr-xmeta-cedartrail/README15
-rw-r--r--meta-cedartrail/conf/machine/cedartrail.conf3
-rw-r--r--meta-chiefriver/README15
-rw-r--r--meta-chiefriver/conf/machine/chiefriver.conf3
-rw-r--r--meta-crownbay/README15
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf3
-rw-r--r--meta-fri2/README15
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
-rw-r--r--meta-sugarbay/README15
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf3
-rw-r--r--meta-sys940x/README15
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf3
12 files changed, 102 insertions, 6 deletions
diff --git a/meta-cedartrail/README b/meta-cedartrail/README
index e47151e..81a1260 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
88you can boot from a USB flash drive (see instructions on how to do 88you can boot from a USB flash drive (see instructions on how to do
89that below, in the section 'Booting the images from /binary'). 89that below, in the section 'Booting the images from /binary').
90 90
91NOTE: The 'cedartrail' machine will include support for hardware video
92acceleration via gstreamer if and only if the "commercial" string is
93added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
94
95For example:
96
97 LICENSE_FLAGS_WHITELIST = "license_cdv-pvr-driver_1.0.3 commercial"
98
99The reason this is needed is to prevent the image from including
100anything that might violate the license terms of the packages used to
101implement the the video acceleration feature, such as gst-ffmpeg and
102ffmpeg. As always, please consult the licenses included in the
103specific packages for details if you use packages that require
104particular LICENSE_FLAGS.
105
91As an alternative to downloading the BSP tarball, you can also work 106As an alternative to downloading the BSP tarball, you can also work
92directly from the meta-intel git repository. For each BSP in the 107directly 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 cd9acd7..33af012 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -22,6 +22,7 @@ SYSLINUX_OPTS = "serial 0 115200"
22SERIAL_CONSOLE = "115200 ttyS0" 22SERIAL_CONSOLE = "115200 ttyS0"
23APPEND += "console=ttyS0,115200 console=tty0" 23APPEND += "console=ttyS0,115200 console=tty0"
24 24
25VA_FEATURES ?= "gst-va-intel va-intel" 25VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
26 "commercial", "gst-va-intel va-intel", "", d)}"
26 27
27MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 28MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-chiefriver/README b/meta-chiefriver/README
index 49e4461..438c293 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
60you can boot from a USB flash drive (see instructions on how to do 60you can boot from a USB flash drive (see instructions on how to do
61that below, in the section 'Booting the images from /binary'). 61that below, in the section 'Booting the images from /binary').
62 62
63NOTE: The 'chiefriver' machine will include support for hardware video
64acceleration via gstreamer if and only if the "commercial" string is
65added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
66
67For example:
68
69 LICENSE_FLAGS_WHITELIST = "commercial"
70
71The reason this is needed is to prevent the image from including
72anything that might violate the license terms of the packages used to
73implement the the video acceleration feature, such as gst-ffmpeg and
74ffmpeg. As always, please consult the licenses included in the
75specific packages for details if you use packages that require
76particular LICENSE_FLAGS.
77
63As an alternative to downloading the BSP tarball, you can also work 78As an alternative to downloading the BSP tarball, you can also work
64directly from the meta-intel git repository. For each BSP in the 79directly 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 6d8d3a5..a9c8e5a 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
18VA_FEATURES ?= "gst-va-intel va-intel" 18VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
19 "commercial", "gst-va-intel va-intel", "", d)}"
19 20
20MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" 21MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms"
diff --git a/meta-crownbay/README b/meta-crownbay/README
index 2521432..f7aeffa 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
92you can boot from a USB flash drive (see instructions on how to do 92you can boot from a USB flash drive (see instructions on how to do
93that below, in the section 'Booting the images from /binary'). 93that below, in the section 'Booting the images from /binary').
94 94
95NOTE: The 'crownbay' machine will include support for hardware video
96acceleration via gstreamer if and only if the "commercial" string is
97added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
98
99For example:
100
101 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14 commercial"
102
103The reason this is needed is to prevent the image from including
104anything that might violate the license terms of the packages used to
105implement the the video acceleration feature, such as gst-ffmpeg and
106ffmpeg. As always, please consult the licenses included in the
107specific packages for details if you use packages that require
108particular LICENSE_FLAGS.
109
95As an alternative to downloading the BSP tarball, you can also work 110As an alternative to downloading the BSP tarball, you can also work
96directly from the meta-intel git repository. For each BSP in the 111directly 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 c4b7682..40dbd1d 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
24APPEND += "video=vesafb vga=0x318" 24APPEND += "video=vesafb vga=0x318"
25 25
26VA_FEATURES ?= "gst-va-intel va-intel" 26VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
27 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
27 28
28MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 29MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
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}"
diff --git a/meta-sugarbay/README b/meta-sugarbay/README
index 413b2ab..80833c1 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 616c2c5..17cc15c 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}"
diff --git a/meta-sys940x/README b/meta-sys940x/README
index b030faf..9058937 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
96you can boot from a USB flash drive (see instructions on how to do 96you can boot from a USB flash drive (see instructions on how to do
97that below, in the section 'Booting the images from /binary'). 97that below, in the section 'Booting the images from /binary').
98 98
99NOTE: The 'sys940x' machine will include support for hardware video
100acceleration via gstreamer if and only if the "commercial" string is
101added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
102
103For example:
104
105 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial"
106
107The reason this is needed is to prevent the image from including
108anything that might violate the license terms of the packages used to
109implement the the video acceleration feature, such as gst-ffmpeg and
110ffmpeg. As always, please consult the licenses included in the
111specific packages for details if you use packages that require
112particular LICENSE_FLAGS.
113
99As an alternative to downloading the BSP tarball, you can also work 114As an alternative to downloading the BSP tarball, you can also work
100directly from the meta-intel git repository. For each BSP in the 115directly 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 9db2b2a..f71bb3a 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"
25SERIAL_CONSOLE = "115200 ttyS0" 25SERIAL_CONSOLE = "115200 ttyS0"
26APPEND += "console=ttyS0,115200 console=tty0" 26APPEND += "console=ttyS0,115200 console=tty0"
27 27
28VA_FEATURES ?= "gst-va-intel va-intel" 28VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
29 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
29 30
30MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 31MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"