[oe-commits] org.oe.dev task-base: merge r1692 from poky:

[koen commit]

task-base: merge r1692 from poky:
task-boot: added modutils-initscripts and update-alternatives

- busybox use update-alternatives
- modutils-initscripts is small and needed for devices with kernel modules in minimal image

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 32a6fec8cdf7e13e39e28b514c9348aad92a8f5a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=32a6fec8cdf7e13e39e28b514c9348aad92a8f5a
Files:
1
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r72f8aced69cb8d855b7cfb9cd803de72f8d78422 -r32a6fec8cdf7e13e39e28b514c9348aad92a8f5a
#
# 
# 
# patch "packages/tasks/task-base.bb"
#  from [d6de83e902983cb4cd0d29c0d01fac327c8e20b1]
#    to [2b2c29568915b448d3708223e248e492e0515cc6]
# 
============================================================
--- packages/tasks/task-base.bb	d6de83e902983cb4cd0d29c0d01fac327c8e20b1
+++ packages/tasks/task-base.bb	2b2c29568915b448d3708223e248e492e0515cc6
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r29"
+PR = "r30"
 
 PACKAGES = 'task-boot \
             task-base \
@@ -139,6 +139,7 @@ RDEPENDS_task-boot = "\
     initscripts \
     modutils-initscripts \
     netbase \
+    update-alternatives \
     ${DISTRO_DEV_MANAGER} \
     ${DISTRO_INIT_MANAGER} \
     ${DISTRO_LOGIN_MANAGER} \
@@ -204,7 +205,6 @@ RDEPENDS_task-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)} \
     "
 
 RRECOMMENDS_task-base-pcmcia = "\
@@ -224,7 +224,6 @@ task-base-pcmcia26 = "\
 
 task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
 RDEPENDS_task-base-bluetooth = "\