summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/tasks/task-base.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/tasks/task-base.bb')
-rw-r--r--meta/recipes-core/tasks/task-base.bb8
1 files changed, 1 insertions, 7 deletions
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
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 3LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r69" 5PR = "r70"
6 6
7inherit task 7inherit task
8 8
@@ -60,11 +60,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
60HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " 60HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
61 61
62# 62#
63# dropbear, openssh or none
64#
65DISTRO_SSH_DAEMON ?= "dropbear"
66
67#
68# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others 63# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
69# 64#
70PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " 65PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
@@ -81,7 +76,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
81RDEPENDS_task-base = "\ 76RDEPENDS_task-base = "\
82 task-distro-base \ 77 task-distro-base \
83 task-machine-base \ 78 task-machine-base \
84 ${DISTRO_SSH_DAEMON} \
85 ${HOTPLUG} \ 79 ${HOTPLUG} \
86 \ 80 \
87 ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ 81 ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \