summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-03-04 14:03:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-16 13:54:30 +0000
commit849c862af198c163ceb80bfaa8152df3ffe3a0ed (patch)
tree150ddb73abef6b722bbe31c973b583fdc38d1ebe /meta
parenta1f722aa9eab9313bcb295e4ff81bd02c34db438 (diff)
downloadpoky-849c862af198c163ceb80bfaa8152df3ffe3a0ed.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/tasks/task-base.bb8
-rw-r--r--meta/recipes-extended/tasks/task-poky-basic.bb3
-rw-r--r--meta/recipes-sato/tasks/task-poky.bb3
3 files changed, 3 insertions, 11 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)} \
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index d7beafedd8..3d313f0e52 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Create Basic Image Tasks" 5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r2" 6PR = "r3"
7LICENSE = "MIT" 7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 8LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -55,7 +55,6 @@ RDEPENDS_task-poky-basic = "\
55 55
56RDEPENDS_task-poky-base-utils = "\ 56RDEPENDS_task-poky-base-utils = "\
57 busybox \ 57 busybox \
58 dropbear \
59 " 58 "
60 59
61RDEPENDS_task-poky-basic-libs = "\ 60RDEPENDS_task-poky-basic-libs = "\
diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb
index cfcbacbf39..72d4d0d9cb 100644
--- a/meta/recipes-sato/tasks/task-poky.bb
+++ b/meta/recipes-sato/tasks/task-poky.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tasks for OpenedHand Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r33" 9PR = "r34"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-apps-console \ 12 task-poky-apps-console \
@@ -37,7 +37,6 @@ FILEMANAGER_mips ?= ""
37 37
38RDEPENDS_task-poky-apps-console = "\ 38RDEPENDS_task-poky-apps-console = "\
39 avahi-daemon \ 39 avahi-daemon \
40 dropbear \
41 dbus \ 40 dbus \
42 portmap \ 41 portmap \
43 ${SPLASH}" 42 ${SPLASH}"