task-base: removed dropbear, hotplug, task-poky-boot from dependencies

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2058 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 305898d2ddc4fe0c5d5d7cdc3bba51dc972113de..37150e485f39942723db8e7d4c003f75f7d6bccf 100644 (file)
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r37"
+PR = "r38"
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = ' \
@@ -11,7 +11,6 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
@@ -47,16 +46,6 @@ PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 
-#
-# linux-hotplug or none
-#
-HOTPLUG ?= " "
-
-#
-# dropbear, openssh or none
-#
-DISTRO_SSH_DAEMON ?= "dropbear"
-
 #
 # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
 #
@@ -72,11 +61,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 # task-base contain stuff needed for base system (machine related)
 #
 RDEPENDS_task-base = "\
-    task-poky-boot \
     task-distro-base \
     task-machine-base \
-    ${DISTRO_SSH_DAEMON} \
-    ${HOTPLUG} \
     \
     task-base-kernel26 \
     ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
@@ -97,7 +83,6 @@ RDEPENDS_task-base = "\
     ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
     "
 
 RDEPENDS_task-base-extended = "\