diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-07-11 20:56:43 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:05 +0200 |
| commit | 8d0e29dd0738aa4c95f4827eac55b5fc0740db76 (patch) | |
| tree | 9cfd2f08cd1fa930aedcdbbd9346c9d9d2f5d04e /meta-oe | |
| parent | 8b774a53c01243af14c50ee92c6c1c88462c7d47 (diff) | |
| download | meta-openembedded-8d0e29dd0738aa4c95f4827eac55b5fc0740db76.tar.gz | |
task-basic: move systemd support to meta systemd
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-core/tasks/task-basic.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb index d4a0bd934..47b09de0e 100644 --- a/meta-oe/recipes-core/tasks/task-basic.bb +++ b/meta-oe/recipes-core/tasks/task-basic.bb | |||
| @@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online" | |||
| 5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
| 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
| 7 | 7 | ||
| 8 | PR = "r8" | 8 | PR = "r9" |
| 9 | 9 | ||
| 10 | inherit task | 10 | inherit task |
| 11 | 11 | ||
| @@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" | |||
| 21 | # Select between dropbear and openssh | 21 | # Select between dropbear and openssh |
| 22 | # Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) | 22 | # Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) |
| 23 | # | 23 | # |
| 24 | TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server" | 24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" |
| 25 | 25 | ||
| 26 | # | 26 | # |
| 27 | # The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom | 27 | # The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom |
| @@ -33,8 +33,7 @@ TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server" | |||
| 33 | # | 33 | # |
| 34 | RDEPENDS_${PN} = "\ | 34 | RDEPENDS_${PN} = "\ |
| 35 | ${TASK_BASIC_SSHDAEMON} \ | 35 | ${TASK_BASIC_SSHDAEMON} \ |
| 36 | avahi-daemon avahi-utils avahi-systemd \ | 36 | avahi-daemon avahi-utils \ |
| 37 | systemd-compat-units \ | ||
| 38 | " | 37 | " |
| 39 | 38 | ||
| 40 | # | 39 | # |