Patchwork [5/5] default-providers.inc: define update-alternatives and -native properly

login
register
mail settings
Submitter Dexuan Cui
Date Sept. 6, 2011, 1:08 p.m.
Message ID <9bbc11b2a451bedd7ad79567ce3d58c1b6a9a5de.1315313790.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/11049/
State New, archived
Headers show

Comments

Dexuan Cui - Sept. 6, 2011, 1:08 p.m.
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@intel.com>
---
 meta/conf/distro/include/default-providers.inc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Patch

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