Patchwork [meta-oe,V2,07/32] task-basic: move systemd support to meta systemd

login
register
mail settings
Submitter Andreas Müller
Date July 13, 2012, 8:30 a.m.
Message ID <1342168240-7760-8-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/31855/
State Accepted
Commit 8d0e29dd0738aa4c95f4827eac55b5fc0740db76
Headers show

Comments

Andreas Müller - July 13, 2012, 8:30 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 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(-)
 create mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
Koen Kooi - July 13, 2012, 8:54 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 10:30, Andreas Müller schreef:
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
> 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(-) 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 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"

If I understand this patchset correctly:

* systemd.bbclass automagically adds ${PN}-systemd to RRECOMMENDS_${PN}
* dropbear bbappend moves to meta-systemd
* everything gets a PR bump

So task-basic can safely drop *-systemd.

Is that understanding correct?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP/+IqMkyGM64RGpERAqQMAKCEaghQ1/6fTFqACChwIZKJae+slQCfdYHc
4HJHSKjK7VVTabOy2/Pv8OQ=
=qrFN
-----END PGP SIGNATURE-----
Andreas Müller - July 13, 2012, 8:59 a.m.
On Fri, Jul 13, 2012 at 10:54 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 13-07-12 10:30, Andreas Müller schreef:
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
>> 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(-) 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 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"
>
> If I understand this patchset correctly:
>
> * systemd.bbclass automagically adds ${PN}-systemd to RRECOMMENDS_${PN}
> * dropbear bbappend moves to meta-systemd
> * everything gets a PR bump
>
> So task-basic can safely drop *-systemd.
>
> Is that understanding correct?
>
> regards,
>
> Koen
Yes

Andreas

Patch

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 \
+"