From 8d0e29dd0738aa4c95f4827eac55b5fc0740db76 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 11 Jul 2012 20:56:43 +0200 Subject: task-basic: move systemd support to meta systemd --- meta-oe/recipes-core/tasks/task-basic.bb | 7 +++---- meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb index d4a0bd934f..47b09de0e3 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r8" +PR = "r9" inherit task @@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" # Select between dropbear and openssh # Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) # -TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server" +TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" # # 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" # RDEPENDS_${PN} = "\ ${TASK_BASIC_SSHDAEMON} \ - avahi-daemon avahi-utils avahi-systemd \ - systemd-compat-units \ + avahi-daemon avahi-utils \ " # diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend new file mode 100644 index 0000000000..358c9cbe4a --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend @@ -0,0 +1,6 @@ +PRINC := "${@int(PRINC) + 1}" + +RDEPENDS_${PN} += "\ + systemd-compat-units \ + avahi-systemd \ +" -- cgit v1.2.3-54-g00ecf