summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-01-16 17:59:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-19 16:32:08 +0000
commitab5bea71e2d1ceb42c50e3ec9dfe480d93e4b74f (patch)
tree3f4661802843a9f4485f136c761eca93b126b350 /meta/conf
parent6de62813bf07f912a21ae57fcceda493c1f92309 (diff)
downloadpoky-ab5bea71e2d1ceb42c50e3ec9dfe480d93e4b74f.tar.gz
default-providers: Change update-alternatives provider to opkg-utils
This allows dependencies to be added to the opkg recipe without causing circular dependency loops. As opkg-utils has minimal dependencies it is the best recipe to provide update-alternatives. This partially solves Yocto Project issue 4836. More work is still needed for a complete solution. (From OE-Core rev: 2f18289493f9c2c67ba343fb8e16743bf5dfee24) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/default-providers.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index e2b0892fae..419ffcdaf2 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -10,15 +10,15 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
10PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 10PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
11PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 11PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
12PREFERRED_PROVIDER_virtual/mesa ?= "mesa" 12PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
13PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" 13PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
14PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 14PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" 15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
16PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" 16PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
17 17
18# 18#
19# Default virtual runtime providers 19# Default virtual runtime providers
20# 20#
21VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" 21VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
22VIRTUAL-RUNTIME_apm ?= "apm" 22VIRTUAL-RUNTIME_apm ?= "apm"
23VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" 23VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
24 24