diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-01-22 15:21:56 -0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2013-01-23 14:03:38 -0600 |
commit | e3155c34af5539f8fa737bb1eee0ebc20eadf762 (patch) | |
tree | 90005b82176f4d80d7e6e401c3de298c5bb978d2 /meta-fri2/conf | |
parent | ee17f93b5dbd7f7a4c84374c385f33ff123f093e (diff) | |
download | meta-intel-e3155c34af5539f8fa737bb1eee0ebc20eadf762.tar.gz |
emgd-1.14: prepare for coexisting with emgd-1.16 recipe
We want to use emgd-1.14 & emgd-1.16 recipe interchangeably.
As the some of the generated package names include versions
which will be different in the emgd-1.16 recipe, this
version part is stripped from the package names so that it
will match with the emgd-1.16 recipe package names.
All the BSP configuration which were using these package names
also change accordingly to avoid any build issues.
Also with the 2 versions of emgd recipes make sure that BSPs
don't start using the emgd-1.16 version until they have been
validated to work by specifying the preferred emgd recipe
version for the relevant BSPs.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2/conf')
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 0efba2a3..e116ac90 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -13,7 +13,7 @@ require conf/machine/include/meta-intel.inc | |||
13 | # Add these only when Xserver is enabled with the EMGD driver | 13 | # Add these only when Xserver is enabled with the EMGD driver |
14 | # Otherwise unwanted X components will start showing up in the non-X images | 14 | # Otherwise unwanted X components will start showing up in the non-X images |
15 | VA_FEATURES ?= "gst-va-intel va-intel \ | 15 | VA_FEATURES ?= "gst-va-intel va-intel \ |
16 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | 16 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" |
17 | 17 | ||
18 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" | 18 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |