[oe-commits] Koen Kooi : task-boot: leave packagemanagement decisions to image recipes

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: cac1ca451a303cf4e234629fed0588fdbd669c69
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=cac1ca451a303cf4e234629fed0588fdbd669c69

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Mon Jan 16 11:50:47 2012 +0100

task-boot: leave packagemanagement decisions to image recipes

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-core/tasks/task-boot.bb |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/tasks/task-boot.bb
index d461888..6c27ffe 100644
--- a/meta-oe/recipes-core/tasks/task-boot.bb
+++ b/meta-oe/recipes-core/tasks/task-boot.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic task to get a device booting"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r56"
+PR = "r57"
 
 inherit task
 
@@ -16,12 +16,6 @@ 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 ?= "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${PREFERRED_PROVIDER_virtual/update-alternatives}", d)}"
-
 # Make sure we build the kernel
 DEPENDS = "virtual/kernel"
 
@@ -34,7 +28,6 @@ RDEPENDS_${PN} = "\
     busybox \
     netbase \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
-    ${DISTRO_UPDATE_ALTERNATIVES} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
     "