[oe-commits] Andreas Müller : task-basic: move systemd support to meta systemd
git at git.openembedded.org
git at git.openembedded.org
Mon Jul 16 07:42:56 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 8d0e29dd0738aa4c95f4827eac55b5fc0740db76
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8d0e29dd0738aa4c95f4827eac55b5fc0740db76
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Wed Jul 11 20:56:43 2012 +0200
task-basic: move systemd support to meta systemd
---
meta-oe/recipes-core/tasks/task-basic.bb | 7 +++----
.../meta-oe/recipes-core/tasks/task-basic.bbappend | 6 ++++++
2 files changed, 9 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..47b09de 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 0000000..358c9cb
--- /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 \
+"
More information about the Openembedded-commits
mailing list