summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb30
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf3
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf3
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
5 files changed, 21 insertions, 19 deletions
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
index de201b2..5dc208d 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
@@ -7,7 +7,7 @@ to LICENSE_FLAGS_WHITELIST += \"license_emgd-driver-bin_1.14\" to your \
7local.conf in order to enable it in a build." 7local.conf in order to enable it in a build."
8LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14" 8LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
9LICENSE_FLAGS = "license_${PN}_${PV}" 9LICENSE_FLAGS = "license_${PN}_${PV}"
10PR = "r6" 10PR = "r7"
11 11
12EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" 12EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
13EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2" 13EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -39,9 +39,9 @@ PKG_${PN}-dev = "emgd-driver-dev"
39PKG_${PN}-dbg = "emgd-driver-dbg" 39PKG_${PN}-dbg = "emgd-driver-dbg"
40PKG_${PN}-doc = "emgd-driver-doc" 40PKG_${PN}-doc = "emgd-driver-doc"
41 41
42PACKAGES =+ "emgd-libmixcommon-0.10.8 emgd-libmixvideo-0.10.9 emgd-libmixvbp-0.10.8 \ 42PACKAGES =+ "emgd-libmixcommon emgd-libmixvideo emgd-libmixvbp \
43 emgd-gst-vabuffer-0.10.8 emgd-gst-plugins-mixvideo-0.10.34 \ 43 emgd-gst-vabuffer emgd-gst-plugins-mixvideo \
44 emgd-gst-plugins-va-0.10.10 emgd-driver-video" 44 emgd-gst-plugins-va emgd-driver-video"
45 45
46# These are closed binaries generated elsewhere so don't check ldflags & text relocations 46# These are closed binaries generated elsewhere so don't check ldflags & text relocations
47INSANE_SKIP_emgd-driver-video = "ldflags textrel" 47INSANE_SKIP_emgd-driver-video = "ldflags textrel"
@@ -49,20 +49,20 @@ INSANE_SKIP_emgd-driver-video = "ldflags textrel"
49INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 49INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
50 50
51# Avoid auto renaming of there packages 51# Avoid auto renaming of there packages
52DEBIAN_NOAUTONAME_emgd-libmixcommon-0.10.8 = "1" 52DEBIAN_NOAUTONAME_emgd-libmixcommon = "1"
53DEBIAN_NOAUTONAME_emgd-libmixvideo-0.10.9 = "1" 53DEBIAN_NOAUTONAME_emgd-libmixvideo = "1"
54DEBIAN_NOAUTONAME_emgd-libmixvbp-0.10.8 = "1" 54DEBIAN_NOAUTONAME_emgd-libmixvbp = "1"
55DEBIAN_NOAUTONAME_emgd-gst-vabuffer-0.10.8 = "1" 55DEBIAN_NOAUTONAME_emgd-gst-vabuffer = "1"
56 56
57FILES_emgd-libmixcommon-0.10.8 = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0" 57FILES_emgd-libmixcommon = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0"
58FILES_emgd-libmixvideo-0.10.9 = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0" 58FILES_emgd-libmixvideo = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0"
59FILES_emgd-libmixvbp-0.10.8 = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \ 59FILES_emgd-libmixvbp = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \
60 ${libdir}/libmixvbp_h264.so.0.10.8 ${libdir}/libmixvbp_h264.so.0 \ 60 ${libdir}/libmixvbp_h264.so.0.10.8 ${libdir}/libmixvbp_h264.so.0 \
61 ${libdir}/libmixvbp_mpeg4.so.0.10.8 ${libdir}/libmixvbp_mpeg4.so.0 \ 61 ${libdir}/libmixvbp_mpeg4.so.0.10.8 ${libdir}/libmixvbp_mpeg4.so.0 \
62 ${libdir}/libmixvbp_vc1.so.0.10.8 ${libdir}/libmixvbp_vc1.so.0 " 62 ${libdir}/libmixvbp_vc1.so.0.10.8 ${libdir}/libmixvbp_vc1.so.0 "
63FILES_emgd-gst-vabuffer-0.10.8 = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0" 63FILES_emgd-gst-vabuffer = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0"
64FILES_emgd-gst-plugins-mixvideo-0.10.34 = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so" 64FILES_emgd-gst-plugins-mixvideo = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so"
65FILES_emgd-gst-plugins-va-0.10.10 = "${libdir}/gstreamer-0.10/libgstvaplugin.so" 65FILES_emgd-gst-plugins-va = "${libdir}/gstreamer-0.10/libgstvaplugin.so"
66FILES_emgd-driver-video = "${libdir}/dri/emgd_drv_video.so" 66FILES_emgd-driver-video = "${libdir}/dri/emgd_drv_video.so"
67FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers" 67FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
68FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug" 68FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 0e10e76..7324c61 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.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 ?= "8.0.4" 23PREFERRED_VERSION_mesa-dri ?= "8.0.4"
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}"
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}"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 0efba2a..e116ac9 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
15VA_FEATURES ?= "gst-va-intel va-intel \ 15VA_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
18MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" 18MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
19MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" 19MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 5f8868d..e47c720 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"
31# Add these only when Xserver is enabled with the EMGD driver 31# Add these only when Xserver is enabled with the EMGD driver
32# Otherwise unwanted X components will start showing up in the non-X images 32# Otherwise unwanted X components will start showing up in the non-X images
33VA_FEATURES ?= "gst-va-intel va-intel \ 33VA_FEATURES ?= "gst-va-intel va-intel \
34 ${@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)}" 34 ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}"
35 35
36MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 36MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"