From 849c862af198c163ceb80bfaa8152df3ffe3a0ed Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Fri, 4 Mar 2011 14:03:02 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/tasks/task-base.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'meta/recipes-core/tasks/task-base.bb') diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb index d613bb2e90..138e617c92 100644 --- a/meta/recipes-core/tasks/task-base.bb +++ b/meta/recipes-core/tasks/task-base.bb @@ -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)} \ -- cgit v1.2.3-54-g00ecf