From 1f60c0ef56414970b8954e81700c356b5ad6cb7b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 30 Sep 2014 10:33:25 +0300 Subject: Include wayland to SDK host part only on iMX6 devices Host part of the SDK need to be configured per device as well, otherwise wayland is build for all machines. Change-Id: If5287da32f1f09fef47826576e48060f6a9b642c Reviewed-by: Laszlo Agocs Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 2 ++ conf/distro/include/imx6qsabresd.conf | 4 ++++ conf/distro/include/nitrogen6x.conf | 4 ++++ .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 679d768..d940595 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -45,6 +45,8 @@ COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudiopars COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" MACHINE_EXTRA_INSTALL ?= "" +MACHINE_EXTRA_INSTALL_SDK ?= "" +MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 7ee426e..4aae29e 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -55,4 +55,8 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libwayland-egl-mx6-dev \ " +MACHINE_EXTRA_INSTALL_SDK_HOST = "\ + wayland-nativesdk \ + " + ADB_PRODUCTID = "0x0000" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 65c7b14..982cf8a 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -58,4 +58,8 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libwayland-egl-mx6-dev \ " +MACHINE_EXTRA_INSTALL_SDK_HOST = "\ + wayland-nativesdk \ + " + ADB_PRODUCTID = "0x0d02" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index b29aa36..596fd73 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -34,7 +34,7 @@ RDEPENDS_${PN} = "\ python-multiprocessing-nativesdk \ python-shell-nativesdk \ python-threading-nativesdk \ - wayland-nativesdk \ + ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ " -- cgit v1.2.3-54-g00ecf