diff options
| author |   Scott Garman <scott.a.garman@intel.com> | 2011-03-04 14:03:02 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-16 13:43:15 +0000 |
| commit | 7e9484241b055975ee0843a91ba12465392370a9 (patch) | |
| tree | b8f4f5926e01e35fa9804eba5b12af775de1f5b0 /meta | |
| parent | 71782f844552636bb0158e7a2271e849259a48c0 (diff) | |
| download | openembedded-core-contrib-7e9484241b055975ee0843a91ba12465392370a9.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.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/tasks/task-base.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-extended/tasks/task-poky-basic.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-sato/tasks/task-poky.bb | 3 |
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 LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r69" +PR = "r70" inherit task @@ -60,11 +60,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 # PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " @@ -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)} \ 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 @@ # DESCRIPTION = "Create Basic Image Tasks" -PR = "r2" +PR = "r3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" @@ -55,7 +55,6 @@ RDEPENDS_task-poky-basic = "\ RDEPENDS_task-poky-base-utils = "\ busybox \ - dropbear \ " RDEPENDS_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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r33" +PR = "r34" PACKAGES = "\ task-poky-apps-console \ @@ -37,7 +37,6 @@ FILEMANAGER_mips ?= "" RDEPENDS_task-poky-apps-console = "\ avahi-daemon \ - dropbear \ dbus \ portmap \ ${SPLASH}" |