task-base, task-poky-basic, task-poky: Remove hard-coded references to dropbear

This is the first step in refactoring the SSH server selection to
be done in IMAGE_FEATURES instead of as hardcoded in these tasks.

(From OE-Core rev: 7e9484241b055975ee0843a91ba12465392370a9)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Garman
2011-03-04 14:03:02 -08:00
committed by Richard Purdie
parent a1f722aa9e
commit 849c862af1
3 changed files with 3 additions and 11 deletions

View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r69"
PR = "r70"
inherit task
@@ -59,11 +59,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
#
HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
#
# dropbear, openssh or none
#
DISTRO_SSH_DAEMON ?= "dropbear"
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
#
@@ -81,7 +76,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
RDEPENDS_task-base = "\
task-distro-base \
task-machine-base \
${DISTRO_SSH_DAEMON} \
${HOTPLUG} \
\
${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \