Patchwork [CONSOLIDATED,PULL,02/20] self-hosted: Fix multiple libx11 error

login
mail settings
Submitter Saul Wold
Date March 6, 2012, 5:03 p.m.
Message ID <4efd2e00d0cd6cc765da809b47d239664fc8922d.1331053126.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/22781/
State New
Headers show

Comments

Saul Wold - March 6, 2012, 5:03 p.m.
From: Zhai Edwin <edwin.zhai@intel.com>

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 <edwin.zhai@intel.com>
---
 meta/recipes-core/tasks/task-self-hosted.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - March 6, 2012, 7:42 p.m.
On Tue, 2012-03-06 at 09:03 -0800, Saul Wold wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
> 
> 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 <edwin.zhai@intel.com>
> ---
>  meta/recipes-core/tasks/task-self-hosted.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Please drop this patch. An alternative patch went in:
Richard Purdie - March 8, 2012, 7:45 p.m.
On Tue, 2012-03-06 at 09:03 -0800, Saul Wold wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
> 
> 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 <edwin.zhai@intel.com>
> ---
>  meta/recipes-core/tasks/task-self-hosted.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

This patch should be dropped, an alternative fix has been merged
(http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=157b44cf72c8660ba53b8fe1b321d2ef314c07ef)

Cheers,

Richard

Patch

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 \
     "