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-crownbay/conf/machine/crownbay.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-crownbay/conf') diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 0e10e76e..7324c61f 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "8.0.4" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" +PREFERRED_VERSION_emgd-driver-bin ?= "1.14" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" @@ -29,6 +30,6 @@ APPEND += "video=vesafb vga=0x318 vmalloc=256MB" # 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