[PATCH] task-boot: use DISTRO_UPDATE_ALTERNATIVES instead of update-alternatives directly

[Martin Jansa <martin.jansa@gmail.com>]

* make opkg RCONFLICTS with update-alternatives-cworth because both
  do the same but installs alternatives to different directory
  (/usr/lib/ipkg/alternatives and /usr/lib/opkg/alternatives)
* Images built after 2009-12-08 9b641bbfed07c075ae5cbe84082a85f1ba703447
  probably use opkg-native, but also ship with u-a-cworth
* Upgrade path is quite difficult, because users should remove cworth
  (RCONFLICT in opkg) and merge alternatives to opkg/alternatives
---
 recipes/opkg/opkg.inc      |    4 +++-
 recipes/tasks/task-boot.bb |   10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 1716034..caf90e7 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -4,10 +4,12 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r18"
+INC_PR = "r19"
 
 FILESPATHPKG =. "opkg:"
 
+RCONFLICTS_${PN} = "update-alternatives-cworth"
+
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 	file://opkg_unarchive.patch;patch=1;maxrev=201 \
 	file://opkg-intercept-cleanup.patch;patch=1;maxrev=241 \
diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb
index 04c5535..45d50ef 100644
--- a/recipes/tasks/task-boot.bb
+++ b/recipes/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r51"
+PR = "r52"
 
 inherit task
 
@@ -13,6 +13,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# update-alternatives script installed in rootfs needs to be the same as
+# u-a script used for building image which is defined with
+# PREFERRED_PROVIDER_virtual/update-alternatives-native
+
+DISTRO_UPDATE_ALTERNATIVES ?= "${PREFERRED_PROVIDER_virtual/update-alternatives}"
+
 # Make sure we build the kernel
 DEPENDS = "virtual/kernel"
 
@@ -26,7 +32,7 @@ RDEPENDS_task-boot = "\
     ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
     modutils-initscripts \
     netbase \
-    update-alternatives \
+    ${DISTRO_UPDATE_ALTERNATIVES} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
     "
 
-- 
1.6.6