Signed-off-by: Andreas Müller <schnitzelt...@googlemail.com> --- meta-oe/recipes-core/tasks/task-basic.bb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb index d4a0bd9..df03df5 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 @@ -31,10 +31,12 @@ TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server" # # Util-linux (u)mount is included because the busybox one can't handle /etc/mtab being symlinked to /proc/mounts # +# avahi is in oe-core but oe-core does not yet have systemd.bbclass so we must decide here which packet we need!! +# If systemd.bbclass should reach oe-core, we can simply rdepend avahi. RDEPENDS_${PN} = "\ ${TASK_BASIC_SSHDAEMON} \ - avahi-daemon avahi-utils avahi-systemd \ - systemd-compat-units \ + avahi-daemon avahi-utils ${@base_conditional('INIT_MANAGER', 'systemd', 'avahi-systemd', 'avahi', d)} \ + ${@base_conditional('INIT_MANAGER', 'systemd', 'systemd-compat-units', '', d)} \ " # -- 1.7.6.4 _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel