Skip to contentSkip to conversation

Clean up meta-systemd

PATCH New Paul Eggleton 1 participant 6 messages Aug 10, 2014

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Clean up meta-systemd

Systemd support has been incorporated within a number of these recipes in OE-Core, so we shouldn't have it here as well.

The following changes since commit e751af9f900834759e59ad2b46a7118a508069e4:

mariadb: update to 5.5.38 (2014-08-10 16:07:19 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/systemd-cleanup
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/systemd-cleanup

Paul Eggleton (5):
dropbear: systemd support now in OE-Core
busybox: systemd support now in OE-Core
avahi: systemd support now in OE-Core
cronie: systemd support now in OE-Core
libpam: systemd support now in OE-Core

 .../avahi/avahi_0.6.31.bbappend                    |  5 -----
 .../busybox/busybox/busybox-klogd.service.in       |  8 --------
 .../busybox/busybox/busybox-syslog.service.in      | 13 -------------
 .../recipes-core/busybox/busybox_%.bbappend        | 22 ----------------------
 .../recipes-core/dropbear/dropbear/dropbear.socket | 10 ----------
 .../dropbear/dropbear/[email protected]            | 11 -----------
 .../dropbear/dropbear/dropbearkey.service          | 10 ----------
 .../recipes-core/dropbear/dropbear_%.bbappend      | 17 -----------------
 .../recipes-extended/cronie/cronie/crond.service   | 10 ----------
 .../recipes-extended/cronie/cronie_1.4.11.bbappend | 13 -------------
 .../recipes-extended/pam/libpam_1.1.6.bbappend     |  4 ----
 11 files changed, 123 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected]
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
 delete mode 100644 meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service
 delete mode 100644 meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/5 dropbear: systemd support now in OE-Core

Signed-off-by Paul Eggleton <[email protected]>
---
 .../recipes-core/dropbear/dropbear/dropbear.socket      | 10 ----------
 .../recipes-core/dropbear/dropbear/[email protected]    | 11 -----------
 .../recipes-core/dropbear/dropbear/dropbearkey.service  | 10 ----------
 .../oe-core/recipes-core/dropbear/dropbear_%.bbappend   | 17 -----------------
 4 files changed, 48 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected]
 delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket deleted +0 -10
deleted file mode 100644
index e5c61b7..0000000
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=dropbear.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
-Also=dropbearkey.service
meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected] deleted +0 -11
deleted file mode 100644
index 59ed07b..0000000
@@ -1,11 +0,0 @@
-[Unit]
-Description=SSH Per-Connection Server
-Requires=dropbearkey.service
-After=syslog.target dropbearkey.service
-
-[Service]
-EnvironmentFile=-/etc/default/dropbear
-ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 $DROPBEAR_EXTRA_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-KillMode=process
meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service deleted +0 -10
deleted file mode 100644
index 7f03000..0000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key
-
-[Service]
-ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend +0 -17
index fc18ea8..181b878 100644
@@ -1,21 +1,4 @@
-inherit systemd
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://dropbearkey.service \
-            file://[email protected] \
-            file://dropbear.socket"
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "dropbear.socket"
 
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
-    ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
-}
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH 2/5 busybox: systemd support now in OE-Core

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 .../busybox/busybox/busybox-klogd.service.in       |  8 --------
 .../busybox/busybox/busybox-syslog.service.in      | 13 -------------
 .../recipes-core/busybox/busybox_%.bbappend        | 22 ----------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in deleted +0 -8
deleted file mode 100644
index d7c7755..0000000
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kernel Logging Service
-
-[Service]
-ExecStart=@base_sbindir@/klogd -n
-
-[Install]
-WantedBy=multi-user.target
meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in deleted +0 -13
deleted file mode 100644
index 2e04321..0000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=System Logging Service
-Wants=busybox-klogd.service
-
-[Service]
-EnvironmentFile=-/etc/default/busybox-syslog
-ExecStart=@base_sbindir@/syslogd -n $OPTIONS
-Sockets=syslog.socket
-
-[Install]
-WantedBy=multi-user.target
-Also=busybox-klogd.service
-Alias=syslog.service
meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend +0 -22
index 6362bdb..642d450 100644
@@ -1,25 +1,3 @@
-inherit systemd
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://busybox-syslog.service.in \
-            file://busybox-klogd.service.in"
-
-SYSTEMD_PACKAGES = "${PN}-syslog"
-SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
-
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
-         > ${D}${systemd_unitdir}/system/busybox-syslog.service
-    sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
-         > ${D}${systemd_unitdir}/system/busybox-klogd.service
-
-    ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
-}
-FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
-
 RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd"
 RREPLACES_${PN}-syslog += "${PN}-syslog-systemd"
 RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd"
Signature · 1 line
1.9.3
author
#3 lore raw

PATCH 3/5 avahi: systemd support now in OE-Core

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 .../oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend         | 5 -----
 1 file changed, 5 deletions(-)
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +0 -5
index 5b6e559..181b878 100644
@@ -1,9 +1,4 @@
-inherit systemd
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "avahi-daemon.service"
-SYSTEMD_AUTO_ENABLE = "enable"
 
-FILES_${PN} += "${systemd_unitdir}/system/"
Signature · 1 line
1.9.3
author
#4 lore raw

PATCH 4/5 cronie: systemd support now in OE-Core

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 .../oe-core/recipes-extended/cronie/cronie/crond.service    | 10 ----------
 .../oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend  | 13 -------------
 2 files changed, 23 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service
meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service deleted +0 -10
deleted file mode 100644
index 5ae193b..0000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-ExecStart=/usr/sbin/crond -n
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend +0 -13
index 8f45f3e..181b878 100644
@@ -1,17 +1,4 @@
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-inherit systemd
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "crond.service"
-
-SRC_URI += "file://crond.service"
-
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system
-}
Signature · 1 line
1.9.3
author
#5 lore raw

PATCH 5/5 libpam: systemd support now in OE-Core

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend deleted +0 -4
deleted file mode 100644
index db55082..0000000
@@ -1,4 +0,0 @@
-# Register with logind to make screen/tmux/etc work
-do_install_append() {
-    echo "session required    pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
-}
Signature · 1 line
1.9.3