* [meta-oe][meta-systemd][PATCH 1/3] openssh: Remove systemd support which is merged in oe-core
2013-09-12 15:28 [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core Muhammad Shakeel
@ 2013-09-12 15:28 ` Muhammad Shakeel
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 2/3] lighttpd: " Muhammad Shakeel
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Muhammad Shakeel @ 2013-09-12 15:28 UTC (permalink / raw)
To: openembedded-devel
OE-Core has been updated to support openssh with systemd. Stuff here is
not required anymore.
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../openssh/openssh/sshd.socket | 11 -----------
.../openssh/openssh/sshd@.service | 9 ---------
.../openssh/openssh/sshdgenkeys.service | 10 ----------
.../openssh/openssh_6.2p2.bbappend | 16 ----------------
4 files changed, 46 deletions(-)
delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket
delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service
delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket
deleted file mode 100644
index 753a33b..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-
-[Socket]
-ExecStartPre=/bin/mkdir -p /var/run/sshd
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service
deleted file mode 100644
index d118490..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog
diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
deleted file mode 100644
index c717214..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-
-[Service]
-ExecStart=/usr/bin/ssh-keygen -A
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend
index d9ad9ba..dadbc14 100644
--- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend
@@ -1,19 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SYSTEMD_PACKAGES = "${PN}-sshd"
-SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
-FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket"
RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
-
-inherit systemd
-
-SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service"
-do_install_append() {
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
-}
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][meta-systemd][PATCH 2/3] lighttpd: Remove systemd support which is merged in oe-core
2013-09-12 15:28 [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core Muhammad Shakeel
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 1/3] openssh: Remove systemd support which is merged " Muhammad Shakeel
@ 2013-09-12 15:28 ` Muhammad Shakeel
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 3/3] rpcbind: " Muhammad Shakeel
2013-09-14 11:08 ` [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it " Martin Jansa
3 siblings, 0 replies; 6+ messages in thread
From: Muhammad Shakeel @ 2013-09-12 15:28 UTC (permalink / raw)
To: openembedded-devel
OE-Core has been updated to support lighttpd with systemd. Stuff here is
not required anymore.
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../lighttpd/lighttpd/lighttpd.service | 13 -------------
.../lighttpd/lighttpd_1.4.32.bbappend | 15 ---------------
2 files changed, 28 deletions(-)
delete mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
deleted file mode 100644
index f4564f3..0000000
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Lightning Fast Webserver With Light System Requirements
-After=syslog.target
-
-[Service]
-Type=oneshot
-EnvironmentFile=-/etc/sysconfig/lighttpd
-ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
index 96fa989..f006b3f 100644
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
@@ -1,18 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://lighttpd.service"
-
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "lighttpd.service"
-
-do_install_append() {
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
-}
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][meta-systemd][PATCH 3/3] rpcbind: Remove systemd support which is merged in oe-core
2013-09-12 15:28 [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core Muhammad Shakeel
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 1/3] openssh: Remove systemd support which is merged " Muhammad Shakeel
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 2/3] lighttpd: " Muhammad Shakeel
@ 2013-09-12 15:28 ` Muhammad Shakeel
2013-09-14 11:08 ` [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it " Martin Jansa
3 siblings, 0 replies; 6+ messages in thread
From: Muhammad Shakeel @ 2013-09-12 15:28 UTC (permalink / raw)
To: openembedded-devel
OE-Core has been updated to support rpcbind with systemd. Stuff here is
not required anymore.
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../rpcbind/rpcbind/rpcbind.service | 13 -------------
.../rpcbind/rpcbind_0.2.0.bbappend | 16 ----------------
2 files changed, 29 deletions(-)
delete mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
diff --git a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
deleted file mode 100644
index a028ace..0000000
--- a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC Bind
-After=network.target
-Wants=rpcbind.target
-Before=rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/rpcbind
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
index 9f83f65..f006b3f 100644
--- a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
@@ -1,19 +1,3 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://rpcbind.service"
-
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "rpcbind.service"
-
-do_install_append() {
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
-}
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core
2013-09-12 15:28 [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core Muhammad Shakeel
` (2 preceding siblings ...)
2013-09-12 15:28 ` [meta-oe][meta-systemd][PATCH 3/3] rpcbind: " Muhammad Shakeel
@ 2013-09-14 11:08 ` Martin Jansa
2013-09-19 12:11 ` Martin Jansa
3 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-09-14 11:08 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2209 bytes --]
On Thu, Sep 12, 2013 at 08:28:08PM +0500, Muhammad Shakeel wrote:
> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> The following changes since commit a506a9efc86cda9dbf36cd916dbbfb1ae2162c45:
>
> log4cplus: add recipe (2013-09-10 22:48:36 +0200)
>
> are available in the git repository at:
>
> https://github.com/mshakeel/meta-oe.git master
> https://github.com//tree/master
>
> Muhammad Shakeel (3):
> openssh: Remove systemd support which is merged in oe-core
> lighttpd: Remove systemd support which is merged in oe-core
> rpcbind: Remove systemd support which is merged in oe-core
Thanks!
You cannot remove PRINC unless PV was incremented in oe-core, so I'll
restore PRINC in rpcbind and lighttpd (you don't need to send v2 for
that).
> .../openssh/openssh/sshd.socket | 11 -----------
> .../openssh/openssh/sshd@.service | 9 ---------
> .../openssh/openssh/sshdgenkeys.service | 10 ----------
> .../openssh/openssh_6.2p2.bbappend | 16 ----------------
> .../lighttpd/lighttpd/lighttpd.service | 13 -------------
> .../lighttpd/lighttpd_1.4.32.bbappend | 15 ---------------
> .../rpcbind/rpcbind/rpcbind.service | 13 -------------
> .../rpcbind/rpcbind_0.2.0.bbappend | 16 ----------------
> 8 files changed, 103 deletions(-)
> delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket
> delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service
> delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
> delete mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
> delete mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
>
> --
> 1.7.9.5
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it in oe-core
2013-09-14 11:08 ` [meta-oe][meta-systemd][PATCH 0/3] Remove systemd support for the packages which already have it " Martin Jansa
@ 2013-09-19 12:11 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-09-19 12:11 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2453 bytes --]
On Sat, Sep 14, 2013 at 01:08:18PM +0200, Martin Jansa wrote:
> On Thu, Sep 12, 2013 at 08:28:08PM +0500, Muhammad Shakeel wrote:
> > Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> > The following changes since commit a506a9efc86cda9dbf36cd916dbbfb1ae2162c45:
> >
> > log4cplus: add recipe (2013-09-10 22:48:36 +0200)
> >
> > are available in the git repository at:
> >
> > https://github.com/mshakeel/meta-oe.git master
> > https://github.com//tree/master
> >
> > Muhammad Shakeel (3):
> > openssh: Remove systemd support which is merged in oe-core
> > lighttpd: Remove systemd support which is merged in oe-core
> > rpcbind: Remove systemd support which is merged in oe-core
>
> Thanks!
>
> You cannot remove PRINC unless PV was incremented in oe-core, so I'll
> restore PRINC in rpcbind and lighttpd (you don't need to send v2 for
> that).
Merged, thanks
>
> > .../openssh/openssh/sshd.socket | 11 -----------
> > .../openssh/openssh/sshd@.service | 9 ---------
> > .../openssh/openssh/sshdgenkeys.service | 10 ----------
> > .../openssh/openssh_6.2p2.bbappend | 16 ----------------
> > .../lighttpd/lighttpd/lighttpd.service | 13 -------------
> > .../lighttpd/lighttpd_1.4.32.bbappend | 15 ---------------
> > .../rpcbind/rpcbind/rpcbind.service | 13 -------------
> > .../rpcbind/rpcbind_0.2.0.bbappend | 16 ----------------
> > 8 files changed, 103 deletions(-)
> > delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket
> > delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd@.service
> > delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
> > delete mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
> > delete mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
> >
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread