task-basic: move systemd support to meta systemd

This commit is contained in:
Andreas Müller
2012-07-11 20:56:43 +02:00
committed by Koen Kooi
parent 8b774a53c0
commit 8d0e29dd07
2 changed files with 9 additions and 4 deletions
+3 -4
View File
@@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PR = "r8" PR = "r9"
inherit task inherit task
@@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
# Select between dropbear and openssh # Select between dropbear and openssh
# Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) # 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 # 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} = "\ RDEPENDS_${PN} = "\
${TASK_BASIC_SSHDAEMON} \ ${TASK_BASIC_SSHDAEMON} \
avahi-daemon avahi-utils avahi-systemd \ avahi-daemon avahi-utils \
systemd-compat-units \
" "
# #
@@ -0,0 +1,6 @@
PRINC := "${@int(PRINC) + 1}"
RDEPENDS_${PN} += "\
systemd-compat-units \
avahi-systemd \
"