Skip to contentSkip to conversation

Remove systemd support for the packages which already have it in oe-core

PATCH Applied Muhammad Shakeel 2 participants 6 messages Sep 12, 2013 – Sep 19, 2013

lore
Share & tools
lore
#0 lore raw

cover Remove systemd support for the packages which already have it in oe-core

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

 .../openssh/openssh/sshd.socket                    |   11 -----------
 .../openssh/openssh/[email protected]                  |    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/[email protected]
 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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/3 openssh: Remove systemd support which is merged in oe-core

OE-Core has been updated to support openssh with systemd. Stuff here is not required anymore.

---
 .../openssh/openssh/sshd.socket                    |   11 -----------
 .../openssh/openssh/[email protected]                  |    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/[email protected]
 delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service
meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket deleted +0 -11
deleted file mode 100644
index 753a33b..0000000
@@ -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
meta-systemd/oe-core/recipes-connectivity/openssh/openssh/[email protected] deleted +0 -9
deleted file mode 100644
index d118490..0000000
@@ -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
meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service deleted +0 -10
deleted file mode 100644
index c717214..0000000
@@ -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
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend +0 -16
index d9ad9ba..dadbc14 100644
@@ -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://[email protected] 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}/[email protected] ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
-}
-
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/3 lighttpd: Remove systemd support which is merged in oe-core

OE-Core has been updated to support lighttpd with systemd. Stuff here is not required anymore.

---
 .../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
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service deleted +0 -13
deleted file mode 100644
index f4564f3..0000000
@@ -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
-
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +0 -15
index 96fa989..f006b3f 100644
@@ -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
-}
-
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/3 rpcbind: Remove systemd support which is merged in oe-core

In reply to Muhammad Shakeel

OE-Core has been updated to support rpcbind with systemd. Stuff here is not required anymore.

---
 .../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
meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service deleted +0 -13
deleted file mode 100644
index a028ace..0000000
@@ -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
meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +0 -16
index 9f83f65..f006b3f 100644
@@ -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
-}
-
Signature · 1 line
1.7.9.5
#4 lore raw
In reply to Muhammad Shakeel
Quoted 7 lines · Muhammad Shakeel

The following changes since commit a506a9efc86cda9dbf36cd916dbbfb1ae2162c45:

log4cplus: add recipe (2013-09-10 22:48:36 +0200)

are available in the git repository at:

Quoted 7 lines

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).

Quoted 22 lines
 .../openssh/openssh/sshd.socket                    |   11 -----------
 .../openssh/openssh/[email protected]                  |    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/[email protected]
 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
Signature · 6 lines
1.7.9.5

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Applied
#5 lore raw
Quoted 16 lines · Martin Jansa
Quoted 7 lines · Muhammad Shakeel

The following changes since commit a506a9efc86cda9dbf36cd916dbbfb1ae2162c45:

log4cplus: add recipe (2013-09-10 22:48:36 +0200)

are available in the git repository at:

Quoted 7 lines

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

Quoted 5 lines

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

Quoted 26 lines
Quoted 23 lines
 .../openssh/openssh/sshd.socket                    |   11 -----------
 .../openssh/openssh/[email protected]                  |    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/[email protected]
 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
Signature · 6 lines
1.7.9.5

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]