From: Ting Liu Date: Thu, 29 Dec 2011 15:05:38 +0000 (+0000) Subject: set PREFERRED_PROVIDER_virtual/libx11 to libx11 X-Git-Tag: 2.1~534^2~540 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=208f7b382a8bfc04ba54e23b94599f2b4b75c7dd;p=meta-freescale.git set PREFERRED_PROVIDER_virtual/libx11 to libx11 To avoid the following error when building fsl-image-lsb/fsl-image-lsb-sdk: ERROR: Multiple .bb files are due to be built which each provide virtual/libx11 (/home/jenkins/poky/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb /home/jenkins/poky/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb). task-core-lsb requires runtime dependency "libx11-locale" which is only provided by libx11_1.3.4.bb. Meanwhile, PREFERRED_PROVIDER_virtual/libx11 is by default set to "libx11-trim". File "libx11-trim_1.3.4.bb" is selected when adding dependency virtual/libx11 for dbus/qt4 etc. Both of the two recipes provide virtual/libx11. Signed-off-by: Ting Liu --- diff --git a/meta-fsl-ppc/conf/distro/fsl.conf b/meta-fsl-ppc/conf/distro/fsl.conf index 93649c3b..25bf9afb 100644 --- a/meta-fsl-ppc/conf/distro/fsl.conf +++ b/meta-fsl-ppc/conf/distro/fsl.conf @@ -48,6 +48,7 @@ https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" IMAGE_CLASSES = "image_types_uboot" PREFERRED_VERSION_u-boot-mkimage-native_powerpc = "2011.06" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" FREESCALE_GIT = "git://git.am.freescale.net"