summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-01-16 17:59:25 +0000
committerAndreas Oberritter <obi@opendreambox.org>2015-02-23 17:15:20 +0100
commitb869cbfb16d15a35bbc64eee4987f507f8d08fd6 (patch)
treee10312ed3d0dece03fee3f7db671d9faee373825 /meta/conf/distro
parenta96743830baa355ef8bdcb4e9a6dfbfbe3148e54 (diff)
downloadopenembedded-core-contrib-b869cbfb16d15a35bbc64eee4987f507f8d08fd6.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. Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2f18289493f9c2c67ba343fb8e16743bf5dfee24) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/conf/distro')
-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"
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
#
# Default virtual runtime providers
#
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"