diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2013-01-18 17:13:38 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-20 13:06:43 +0000 |
commit | 59e15f671222077db57d394b1f022549fa3509ff (patch) | |
tree | 8f3825c5def618387b023b7af77b78f3e87cf388 /meta/conf/distro/include/default-providers.inc | |
parent | 3df0d2390de37c80b37041b5f02b352b77c11209 (diff) | |
download | poky-59e15f671222077db57d394b1f022549fa3509ff.tar.gz |
update-alternatives: Add a build-time dependency
We need to add a build time dependency on virtual/update-alternatives,
however we can't just do DEPENDS +=, or we end up with various problems. To
work around this, in the anonymous python space we ensure we only do the
addition when the package does not provide virtual/update-alternatives and
it is a target package.
Also the system wide PREFERRED_PROVIDER was incorrect. It references a
runtime package, and not the recipe it should have. This has been corrected.
[YOCTO #3691]
(From OE-Core rev: 56a59ef12936dcc6464cf1d43dda6957a5aa8c65)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Tested-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include/default-providers.inc')
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 12a581d080..444176c60a 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" | |||
8 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | 8 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" |
9 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" | 9 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" |
10 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" | 10 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" |
11 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | 11 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" |
12 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | 12 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" |
13 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" | 13 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" |
14 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" | 14 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" |