mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
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>
This commit is contained in:
Nitin A Kamble
Tom Zanussi
parent
ee17f93b5d
commit
e3155c34af
|
|
@ -7,7 +7,7 @@ to LICENSE_FLAGS_WHITELIST += \"license_emgd-driver-bin_1.14\" to your \
|
|||
local.conf in order to enable it in a build."
|
||||
LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
|
||||
LICENSE_FLAGS = "license_${PN}_${PV}"
|
||||
PR = "r6"
|
||||
PR = "r7"
|
||||
|
||||
EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
|
||||
EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
|
||||
|
|
@ -39,9 +39,9 @@ PKG_${PN}-dev = "emgd-driver-dev"
|
|||
PKG_${PN}-dbg = "emgd-driver-dbg"
|
||||
PKG_${PN}-doc = "emgd-driver-doc"
|
||||
|
||||
PACKAGES =+ "emgd-libmixcommon-0.10.8 emgd-libmixvideo-0.10.9 emgd-libmixvbp-0.10.8 \
|
||||
emgd-gst-vabuffer-0.10.8 emgd-gst-plugins-mixvideo-0.10.34 \
|
||||
emgd-gst-plugins-va-0.10.10 emgd-driver-video"
|
||||
PACKAGES =+ "emgd-libmixcommon emgd-libmixvideo emgd-libmixvbp \
|
||||
emgd-gst-vabuffer emgd-gst-plugins-mixvideo \
|
||||
emgd-gst-plugins-va emgd-driver-video"
|
||||
|
||||
# These are closed binaries generated elsewhere so don't check ldflags & text relocations
|
||||
INSANE_SKIP_emgd-driver-video = "ldflags textrel"
|
||||
|
|
@ -49,20 +49,20 @@ INSANE_SKIP_emgd-driver-video = "ldflags textrel"
|
|||
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
|
||||
# Avoid auto renaming of there packages
|
||||
DEBIAN_NOAUTONAME_emgd-libmixcommon-0.10.8 = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-libmixvideo-0.10.9 = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-libmixvbp-0.10.8 = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-gst-vabuffer-0.10.8 = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-libmixcommon = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-libmixvideo = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-libmixvbp = "1"
|
||||
DEBIAN_NOAUTONAME_emgd-gst-vabuffer = "1"
|
||||
|
||||
FILES_emgd-libmixcommon-0.10.8 = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0"
|
||||
FILES_emgd-libmixvideo-0.10.9 = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0"
|
||||
FILES_emgd-libmixvbp-0.10.8 = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \
|
||||
FILES_emgd-libmixcommon = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0"
|
||||
FILES_emgd-libmixvideo = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0"
|
||||
FILES_emgd-libmixvbp = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \
|
||||
${libdir}/libmixvbp_h264.so.0.10.8 ${libdir}/libmixvbp_h264.so.0 \
|
||||
${libdir}/libmixvbp_mpeg4.so.0.10.8 ${libdir}/libmixvbp_mpeg4.so.0 \
|
||||
${libdir}/libmixvbp_vc1.so.0.10.8 ${libdir}/libmixvbp_vc1.so.0 "
|
||||
FILES_emgd-gst-vabuffer-0.10.8 = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0"
|
||||
FILES_emgd-gst-plugins-mixvideo-0.10.34 = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so"
|
||||
FILES_emgd-gst-plugins-va-0.10.10 = "${libdir}/gstreamer-0.10/libgstvaplugin.so"
|
||||
FILES_emgd-gst-vabuffer = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0"
|
||||
FILES_emgd-gst-plugins-mixvideo = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so"
|
||||
FILES_emgd-gst-plugins-va = "${libdir}/gstreamer-0.10/libgstvaplugin.so"
|
||||
FILES_emgd-driver-video = "${libdir}/dri/emgd_drv_video.so"
|
||||
FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers"
|
||||
FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug"
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
|
|||
PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
|
||||
PREFERRED_VERSION_mesa-dri ?= "7.11"
|
||||
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}"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ require conf/machine/include/meta-intel.inc
|
|||
# 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_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
|
||||
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user