From patchwork Tue Mar 6 17:03:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,02/20] self-hosted: Fix multiple libx11 error Date: Tue, 06 Mar 2012 17:03:05 -0000 From: Saul Wold X-Patchwork-Id: 22781 Message-Id: <4efd2e00d0cd6cc765da809b47d239664fc8922d.1331053126.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Zhai Edwin Self-hosted needs package libx11-dev, which is ambiguous as virtual/libx11 is provided by libx11 or libx11-trim. This patch explictly set the perferred one, libx11-trim-dev, to avoid this. Signed-off-by: Zhai Edwin --- meta/recipes-core/tasks/task-self-hosted.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb index 586a461..a6cf75f 100644 --- a/meta/recipes-core/tasks/task-self-hosted.bb +++ b/meta/recipes-core/tasks/task-self-hosted.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "Create Basic Image Tasks" -PR = "r6" +PR = "r7" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" @@ -189,6 +189,6 @@ RDEPENDS_task-self-hosted-graphics = "\ libglu-dev \ libsdl \ libsdl-dev \ - libx11-dev \ + libx11-trim-dev \ python-pygtk \ "