* [PATCH V2 1/5] systemd: add 'less' to its RDEPENDS
2014-01-17 10:39 [PATCH V2 0/5] systemd misc fixes Chen Qi
@ 2014-01-17 10:39 ` Chen Qi
2014-01-17 11:40 ` Burton, Ross
2014-01-17 10:39 ` [PATCH V2 2/5] dropbear: add systemd unit files Chen Qi
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Chen Qi @ 2014-01-17 10:39 UTC (permalink / raw)
To: openembedded-core
The less command provided by busybox cannot interpret the control
character, resulting in obscure output of the journalctl command
in a systemd based image.
Add the 'less' package to systemd's RDEPENDS so that the output
of 'journalctl' looks clear to users.
[YOCTO #5723]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-core/systemd/systemd_208.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index 6590235..3659abd 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -217,7 +217,8 @@ FILES_${PN} = " ${base_bindir}/* \
FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
-RDEPENDS_${PN} += "kmod dbus util-linux-mount"
+# less package is needed to correctly display the contents of 'journalctl'
+RDEPENDS_${PN} += "kmod dbus util-linux-mount less"
RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \
util-linux-agetty \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH V2 1/5] systemd: add 'less' to its RDEPENDS
2014-01-17 10:39 ` [PATCH V2 1/5] systemd: add 'less' to its RDEPENDS Chen Qi
@ 2014-01-17 11:40 ` Burton, Ross
0 siblings, 0 replies; 7+ messages in thread
From: Burton, Ross @ 2014-01-17 11:40 UTC (permalink / raw)
To: Chen Qi; +Cc: OE-core
On 17 January 2014 10:39, Chen Qi <Qi.Chen@windriver.com> wrote:
> The less command provided by busybox cannot interpret the control
> character, resulting in obscure output of the journalctl command
> in a systemd based image.
>
> Add the 'less' package to systemd's RDEPENDS so that the output
> of 'journalctl' looks clear to users.
Recommends, please. From a glance at the source busybox less does
support some control characters, so maybe we should file a bug there
too.
Ross
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V2 2/5] dropbear: add systemd unit files
2014-01-17 10:39 [PATCH V2 0/5] systemd misc fixes Chen Qi
2014-01-17 10:39 ` [PATCH V2 1/5] systemd: add 'less' to its RDEPENDS Chen Qi
@ 2014-01-17 10:39 ` Chen Qi
2014-01-17 10:39 ` [PATCH V2 3/5] openssh: fixes for systemd Chen Qi
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Chen Qi @ 2014-01-17 10:39 UTC (permalink / raw)
To: openembedded-core
This patch mainly comes from meta-systemd with a few modifications.
The purpose is to get rid of the LSB init scripts in systemd images.
[YOCTO #4420]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-core/dropbear/dropbear.inc | 17 ++++++++++++++++-
.../recipes-core/dropbear/dropbear/dropbear.socket | 10 ++++++++++
.../dropbear/dropbear/dropbear@.service | 11 +++++++++++
.../dropbear/dropbear/dropbearkey.service | 8 ++++++++
4 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.socket
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear@.service
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index e85a9e6..d5fceec 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -19,17 +19,22 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://0004-fix-2kb-keys.patch \
file://0007-dropbear-fix-for-x32-abi.patch \
file://init \
+ file://dropbearkey.service \
+ file://dropbear@.service \
+ file://dropbear.socket \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
file://0006-dropbear-configuration-file.patch \
file://dropbear"
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
INITSCRIPT_NAME = "dropbear"
INITSCRIPT_PARAMS = "defaults 10"
+SYSTEMD_SERVICE_${PN} = "dropbear.socket"
+
CFLAGS_prepend = " -I. "
LD = "${CC}"
@@ -66,6 +71,16 @@ do_install() {
install -d ${D}${sysconfdir}/pam.d
install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
fi
+
+ # deal with systemd unit files
+ 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
+ sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ -e 's,@BINDIR@,${bindir},g' \
+ -e 's,@SBINDIR@,${sbindir},g' \
+ ${D}${systemd_unitdir}/system/dropbear.socket ${D}${systemd_unitdir}/system/*.service
}
inherit update-alternatives
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.socket b/meta/recipes-core/dropbear/dropbear/dropbear.socket
new file mode 100644
index 0000000..e5c61b7
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear.socket
@@ -0,0 +1,10 @@
+[Unit]
+Conflicts=dropbear.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=dropbearkey.service
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear@.service b/meta/recipes-core/dropbear/dropbear/dropbear@.service
new file mode 100644
index 0000000..6fe9942
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SSH Per-Connection Server
+Wants=dropbearkey.service
+After=syslog.target dropbearkey.service
+
+[Service]
+EnvironmentFile=-/etc/default/dropbear
+ExecStart=-@SBINDIR@/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key $DROPBEAR_EXTRA_ARGS
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+StandardInput=socket
+KillMode=process
diff --git a/meta/recipes-core/dropbear/dropbear/dropbearkey.service b/meta/recipes-core/dropbear/dropbear/dropbearkey.service
new file mode 100644
index 0000000..ccc21d5
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbearkey.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=SSH Key Generation
+ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+RemainAfterExit=yes
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 3/5] openssh: fixes for systemd
2014-01-17 10:39 [PATCH V2 0/5] systemd misc fixes Chen Qi
2014-01-17 10:39 ` [PATCH V2 1/5] systemd: add 'less' to its RDEPENDS Chen Qi
2014-01-17 10:39 ` [PATCH V2 2/5] dropbear: add systemd unit files Chen Qi
@ 2014-01-17 10:39 ` Chen Qi
2014-01-17 10:39 ` [PATCH V2 4/5] distcc: add systemd support Chen Qi
2014-01-17 10:39 ` [PATCH V2 5/5] at: " Chen Qi
4 siblings, 0 replies; 7+ messages in thread
From: Chen Qi @ 2014-01-17 10:39 UTC (permalink / raw)
To: openembedded-core
This patch contains a few fixes for the systemd unit files of openssh.
The fixes use the same unit files in Fedora 20 as a reference.
1) Remove sshdgenkeys.service and sshd@.service from SYSTEMD_SERVICE.
2) Fix the dependency and logic of sshdgenkeys.service.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
.../openssh/openssh-6.4p1/sshd.socket | 1 -
.../openssh/openssh-6.4p1/sshd@.service | 1 +
.../openssh/openssh-6.4p1/sshdgenkeys.service | 8 ++++----
meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket
index d19ab2a..12c39b2 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket
+++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket
@@ -8,4 +8,3 @@ Accept=yes
[Install]
WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service
index 64e009f..4eda659 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service
+++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service
@@ -1,5 +1,6 @@
[Unit]
Description=OpenSSH Per-Connection Daemon
+Wants=sshdgenkeys.service
After=sshdgenkeys.service
[Service]
diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service
index 2fd8a9a..c21d70b 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service
+++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service
@@ -1,10 +1,10 @@
[Unit]
-Description=SSH Key Generation
+Description=OpenSSH Key Generation
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
[Service]
ExecStart=@BINDIR@/ssh-keygen -A
Type=oneshot
RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
index c61d16f..1f78566 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
@@ -44,7 +44,7 @@ INITSCRIPT_NAME_${PN}-sshd = "sshd"
INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
SYSTEMD_PACKAGES = "${PN}-sshd"
-SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
PACKAGECONFIG ??= "tcp-wrappers"
PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
@@ -114,7 +114,7 @@ ALLOW_EMPTY_${PN} = "1"
PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
FILES_${PN}-scp = "${bindir}/scp.${BPN}"
FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
-FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
+FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system"
FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd"
FILES_${PN}-sftp = "${bindir}/sftp"
FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 4/5] distcc: add systemd support
2014-01-17 10:39 [PATCH V2 0/5] systemd misc fixes Chen Qi
` (2 preceding siblings ...)
2014-01-17 10:39 ` [PATCH V2 3/5] openssh: fixes for systemd Chen Qi
@ 2014-01-17 10:39 ` Chen Qi
2014-01-17 10:39 ` [PATCH V2 5/5] at: " Chen Qi
4 siblings, 0 replies; 7+ messages in thread
From: Chen Qi @ 2014-01-17 10:39 UTC (permalink / raw)
To: openembedded-core
Add systemd support for distcc.
These unit files mainly use the same files in Fedora 20 as a reference.
[YOCTO #4420]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-devtools/distcc/distcc_3.1.bb | 14 +++++++++++---
meta/recipes-devtools/distcc/files/default | 5 +++++
meta/recipes-devtools/distcc/files/distccd.service | 11 +++++++++++
3 files changed, 27 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/distcc/files/distccd.service
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index e351a58..c3cbd05 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -22,12 +22,13 @@ SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
file://separatebuilddir.patch \
file://default \
file://distccmon-gnome.desktop \
- file://distcc"
+ file://distcc \
+ file://distccd.service"
SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
-inherit autotools pkgconfig update-rc.d useradd
+inherit autotools pkgconfig update-rc.d useradd systemd
EXTRA_OECONF += "--disable-Werror PYTHON=/dev/null"
@@ -40,11 +41,17 @@ USERADD_PARAM_${PN} = "--system \
INITSCRIPT_NAME = "distcc"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "distccd.service"
+
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/distccd.service ${D}${systemd_unitdir}/system
+ sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distccd.service
${DESKTOPINSTALL}
}
DESKTOPINSTALL = ""
@@ -58,7 +65,8 @@ FILES_${PN} = " ${sysconfdir} \
${bindir}/distcc \
${bindir}/lsdistcc \
${bindir}/distccd \
- ${bindir}/distccmon-text"
+ ${bindir}/distccmon-text \
+ ${systemd_unitdir}/system/distccd.service"
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
${datadir}/distcc"
diff --git a/meta/recipes-devtools/distcc/files/default b/meta/recipes-devtools/distcc/files/default
index 95290f8..63c4159 100644
--- a/meta/recipes-devtools/distcc/files/default
+++ b/meta/recipes-devtools/distcc/files/default
@@ -17,3 +17,8 @@ STARTDISTCC="true"
# ALLOWEDNETS="127.0.0.1"
ALLOWEDNETS="192.168.7.0/24"
+
+#
+# OPTIONS is used for the systemd service file
+#
+OPTIONS="--allow 192.168.7.0/24"
diff --git a/meta/recipes-devtools/distcc/files/distccd.service b/meta/recipes-devtools/distcc/files/distccd.service
new file mode 100644
index 0000000..0253ddf
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/distccd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Distccd A Distributed Compilation Server
+After=network.target
+
+[Service]
+User=distcc
+EnvironmentFile=-/etc/default/distcc
+ExecStart=@BINDIR@/distccd --verbose --no-detach --daemon $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 5/5] at: add systemd support
2014-01-17 10:39 [PATCH V2 0/5] systemd misc fixes Chen Qi
` (3 preceding siblings ...)
2014-01-17 10:39 ` [PATCH V2 4/5] distcc: add systemd support Chen Qi
@ 2014-01-17 10:39 ` Chen Qi
4 siblings, 0 replies; 7+ messages in thread
From: Chen Qi @ 2014-01-17 10:39 UTC (permalink / raw)
To: openembedded-core
Add systemd support for at.
This patch mainly comes from meta-systemd.
[YOCTO #4420]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-extended/at/at_3.1.14.bb | 10 +++++++++-
meta/recipes-extended/at/files/atd.service | 9 +++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/at/files/atd.service
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb
index 0a13157..480e732 100644
--- a/meta/recipes-extended/at/at_3.1.14.bb
+++ b/meta/recipes-extended/at/at_3.1.14.bb
@@ -22,6 +22,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://posixtm.h \
file://file_replacement_with_gplv2.patch \
file://S99at \
+ file://atd.service \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
PAM_SRC_URI = "file://pam.conf.patch \
@@ -37,7 +38,9 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-atspool=/var/spool/at/spool \
ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} "
-inherit autotools
+inherit autotools systemd
+
+SYSTEMD_SERVICE_${PN} = "atd.service"
PARALLEL_MAKE = ""
@@ -53,6 +56,11 @@ do_install () {
install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
+ # install systemd unit files
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
+ sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service
+
if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
fi
diff --git a/meta/recipes-extended/at/files/atd.service b/meta/recipes-extended/at/files/atd.service
new file mode 100644
index 0000000..6dc8445
--- /dev/null
+++ b/meta/recipes-extended/at/files/atd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Job spooling tools
+After=syslog.target
+
+[Service]
+ExecStart=@SBINDIR@/atd -f
+
+[Install]
+WantedBy=multi-user.target
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread