[OE-core] [PATCH 5/5] default-providers.inc: define update-alternatives and -native properly
Dexuan Cui
dexuan.cui at intel.com
Tue Sep 6 13:08:39 UTC 2011
For DEB packaging, we should use the -dpkg versions;
For IPK packaging, we should use the -cworth and opkg versions.
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
---
meta/conf/distro/include/default-providers.inc | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d51ac64..f818f37 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -6,15 +6,14 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "${@base_conditional('IMAGE_PKGTYPE', 'deb', 'update-alternatives-dpkg-native', 'opkg-native', d)}"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
#
# Default virtual runtime providers
#
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+VIRTUAL-RUNTIME_update-alternatives ?= "${@base_conditional('IMAGE_PKGTYPE', 'deb', 'update-alternatives-dpkg', 'update-alternatives-cworth', d)}"
#
# Default recipe providers
--
1.7.6
More information about the Openembedded-core
mailing list