* [meta-systemd][PATCH 0/5] Clean up meta-systemd
@ 2014-08-10 16:14 Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 1/5] dropbear: systemd support now in OE-Core Paul Eggleton
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
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/dropbear@.service | 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/dropbear@.service
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
--
1.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-systemd][PATCH 1/5] dropbear: systemd support now in OE-Core
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
@ 2014-08-10 16:14 ` Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 2/5] busybox: " Paul Eggleton
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../recipes-core/dropbear/dropbear/dropbear.socket | 10 ----------
.../recipes-core/dropbear/dropbear/dropbear@.service | 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/dropbear@.service
delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
deleted file mode 100644
index e5c61b7..0000000
--- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=dropbear.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
-Also=dropbearkey.service
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service
deleted file mode 100644
index 59ed07b..0000000
--- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service
+++ /dev/null
@@ -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
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
deleted file mode 100644
index 7f03000..0000000
--- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
+++ /dev/null
@@ -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
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend
index fc18ea8..181b878 100644
--- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend
+++ b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend
@@ -1,21 +1,4 @@
-inherit systemd
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://dropbearkey.service \
- file://dropbear@.service \
- 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}/dropbear@.service ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
- ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
-}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-systemd][PATCH 2/5] busybox: systemd support now in OE-Core
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 1/5] dropbear: systemd support now in OE-Core Paul Eggleton
@ 2014-08-10 16:14 ` Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 3/5] avahi: " Paul Eggleton
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
deleted file mode 100644
index d7c7755..0000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kernel Logging Service
-
-[Service]
-ExecStart=@base_sbindir@/klogd -n
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
deleted file mode 100644
index 2e04321..0000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ /dev/null
@@ -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
diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
index 6362bdb..642d450 100644
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
@@ -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"
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-systemd][PATCH 3/5] avahi: systemd support now in OE-Core
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 1/5] dropbear: systemd support now in OE-Core Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 2/5] busybox: " Paul Eggleton
@ 2014-08-10 16:14 ` Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 4/5] cronie: " Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 5/5] libpam: " Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend | 5 -----
1 file changed, 5 deletions(-)
diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
index 5b6e559..181b878 100644
--- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
@@ -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/"
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-systemd][PATCH 4/5] cronie: systemd support now in OE-Core
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
` (2 preceding siblings ...)
2014-08-10 16:14 ` [meta-systemd][PATCH 3/5] avahi: " Paul Eggleton
@ 2014-08-10 16:14 ` Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 5/5] libpam: " Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service b/meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service
deleted file mode 100644
index 5ae193b..0000000
--- a/meta-systemd/oe-core/recipes-extended/cronie/cronie/crond.service
+++ /dev/null
@@ -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
diff --git a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend
index 8f45f3e..181b878 100644
--- a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.11.bbappend
@@ -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
-}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-systemd][PATCH 5/5] libpam: systemd support now in OE-Core
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
` (3 preceding siblings ...)
2014-08-10 16:14 ` [meta-systemd][PATCH 4/5] cronie: " Paul Eggleton
@ 2014-08-10 16:14 ` Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2014-08-10 16:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
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
diff --git a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
deleted file mode 100644
index db55082..0000000
--- a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
+++ /dev/null
@@ -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
-}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-08-10 16:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-10 16:14 [meta-systemd][PATCH 0/5] Clean up meta-systemd Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 1/5] dropbear: systemd support now in OE-Core Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 2/5] busybox: " Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 3/5] avahi: " Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 4/5] cronie: " Paul Eggleton
2014-08-10 16:14 ` [meta-systemd][PATCH 5/5] libpam: " Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.