From 1e556dfb77c23b7009c9f9670d359b51c9491d14 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 4 Sep 2017 16:17:59 +0300 Subject: emulator: fix conflicting glesstream packages qtglesstream-dummy-client is needed to provide qtbase with opengl headers and dummy library and the real qtglesstream is then built against qtbase to provide it actual implementation. Now qtglesstream-dummy-client is built to provide files to the sysroot, but not any packages, and qtglesstream is built to provide the packages, but to deploy nothing to the sysroot. Solves do_rootfs error: package packagegroup-b2qt-embedded-base-1.0-r0.all requires qtglesstream, but none of the providers can be installed Change-Id: Ib388599d9240a5ab9351692a4509adf721cc995c Reviewed-by: Mikko Gronoff --- recipes-qt/qt5-addons/qtglesstream.bb | 2 -- recipes/opengldummy/qtglesstream-dummy-client.bb | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 57eae88..e9215b6 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -44,8 +44,6 @@ BRANCH = "dev" S = "${WORKDIR}/git" DEPENDS = "qtbase" -RREPLACES_${PN} = "qtglesstream-dummy-client" -RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev" do_install_append() { install -m 0755 -d ${D}${includedir}/EGL diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb index ad33127..1d4e223 100644 --- a/recipes/opengldummy/qtglesstream-dummy-client.bb +++ b/recipes/opengldummy/qtglesstream-dummy-client.bb @@ -38,6 +38,8 @@ SOLIBMINOR = "0" require opengldummy.inc +inherit nopackages + S = "${WORKDIR}" do_compile() { -- cgit v1.2.3-54-g00ecf