diff options
| author | Ting Liu <b28495@freescale.com> | 2011-12-29 15:05:38 +0000 |
|---|---|---|
| committer | Matthew McClintock <msm@freescale.com> | 2012-01-02 15:59:16 -0600 |
| commit | 2be8b6a4319d7ce67880c91b5a3b5f25a9a3d34a (patch) | |
| tree | 569aa5fa613d9bc2e37a86d2dc1e493e8622c3df /conf/distro/fsl.conf | |
| parent | aa1bdc198c3ee9f2eef571cd6e96ca04e49b7be6 (diff) | |
| download | meta-fsl-ppc-2be8b6a4319d7ce67880c91b5a3b5f25a9a3d34a.tar.gz | |
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 <b28495@freescale.com>
Diffstat (limited to 'conf/distro/fsl.conf')
| -rw-r--r-- | conf/distro/fsl.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/distro/fsl.conf b/conf/distro/fsl.conf index 93649c3..25bf9af 100644 --- a/conf/distro/fsl.conf +++ b/conf/distro/fsl.conf | |||
| @@ -48,6 +48,7 @@ https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" | |||
| 48 | IMAGE_CLASSES = "image_types_uboot" | 48 | IMAGE_CLASSES = "image_types_uboot" |
| 49 | 49 | ||
| 50 | PREFERRED_VERSION_u-boot-mkimage-native_powerpc = "2011.06" | 50 | PREFERRED_VERSION_u-boot-mkimage-native_powerpc = "2011.06" |
| 51 | PREFERRED_PROVIDER_virtual/libx11 = "libx11" | ||
| 51 | 52 | ||
| 52 | FREESCALE_GIT = "git://git.am.freescale.net" | 53 | FREESCALE_GIT = "git://git.am.freescale.net" |
| 53 | 54 | ||