summaryrefslogtreecommitdiffstats
path: root/meta-emenlow
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-22 23:21:56 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-01-23 20:03:38 (GMT)
commite3155c34af5539f8fa737bb1eee0ebc20eadf762 (patch)
tree90005b82176f4d80d7e6e401c3de298c5bb978d2 /meta-emenlow
parentee17f93b5dbd7f7a4c84374c385f33ff123f093e (diff)
downloadmeta-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-emenlow')
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 39da41c..dc9fde8 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
22PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 22PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
23PREFERRED_VERSION_mesa-dri ?= "7.11" 23PREFERRED_VERSION_mesa-dri ?= "7.11"
24PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 24PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
25PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
25 26
26APPEND += "video=vesafb vga=0x318 vmalloc=256MB" 27APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
27 28
@@ -29,6 +30,6 @@ APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
29# Add these only when Xserver is enabled with the EMGD driver 30# Add these only when Xserver is enabled with the EMGD driver
30# Otherwise unwanted X components will start showing up in the non-X images 31# Otherwise unwanted X components will start showing up in the non-X images
31VA_FEATURES ?= "gst-va-intel va-intel \ 32VA_FEATURES ?= "gst-va-intel va-intel \
32 ${@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)}" 33 ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}"
33 34
34MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 35MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"