From e3155c34af5539f8fa737bb1eee0ebc20eadf762 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 22 Jan 2013 15:21:56 -0800 Subject: 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 Acked-by: Darren Hart Signed-off-by: Tom Zanussi --- meta-sys940x/conf/machine/sys940x.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-sys940x') diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index 5f8868de..e47c720c 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -31,6 +31,6 @@ APPEND += "console=ttyS0,115200 console=tty0" # Add these only when Xserver is enabled with the EMGD driver # Otherwise unwanted X components will start showing up in the non-X images VA_FEATURES ?= "gst-va-intel va-intel \ - ${@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)}" + ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf