* [PATCH 1/4] openssh: Add systemd support
@ 2013-08-01 11:43 Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 2/4] lighttpd: " Shakeel, Muhammad
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Shakeel, Muhammad @ 2013-08-01 11:43 UTC (permalink / raw)
To: openembedded-core
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
-Remove dependency on meta-systemd
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../openssh/openssh-6.2p2/sshd.socket | 11 ++++++++++
.../openssh/openssh-6.2p2/sshd@.service | 9 +++++++++
.../openssh/openssh-6.2p2/sshdgenkeys.service | 10 ++++++++++
meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 21 ++++++++++++++++++--
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 0000000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[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/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 0000000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[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/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 0000000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[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/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index ab2eefb..0821190 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
- ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+ file://sshd.socket \
+ file://sshd@.service \
+ file://sshdgenkeys.service "
PAM_SRC_URI = "file://sshd"
SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
SRC_URI[sha256sum] = "7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
USERADD_PACKAGES = "${PN}-sshd"
USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
INITSCRIPT_NAME_${PN}-sshd = "sshd"
INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
+SYSTEMD_AUTO_ENABLE = "enable"
+
PACKAGECONFIG ??= "tcp-wrappers"
PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
@@ -86,6 +93,15 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir}
+
+ 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
+ sed -i 's,/bin,${base_bindir},g' ${D}${systemd_unitdir}/system/sshd.socket
+ sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/sshd@.service
+ sed -i 's,/bin,${base_bindir},g' ${D}${systemd_unitdir}/system/sshd@.service
+ sed -i 's,/usr/bin/,${bindir}/,g' ${D}${systemd_unitdir}/system/sshdgenkeys.service
}
ALLOW_EMPTY_${PN} = "1"
@@ -95,6 +111,7 @@ 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 += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
+FILES_${PN}-sshd += "${systemd_unitdir}"
FILES_${PN}-sftp = "${bindir}/sftp"
FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] lighttpd: Add systemd support
2013-08-01 11:43 [PATCH 1/4] openssh: Add systemd support Shakeel, Muhammad
@ 2013-08-01 11:43 ` Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 3/4] rpcbind: " Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 4/4] nfs-utils: " Shakeel, Muhammad
2 siblings, 0 replies; 6+ messages in thread
From: Shakeel, Muhammad @ 2013-08-01 11:43 UTC (permalink / raw)
To: openembedded-core
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
- Remove dependency on meta-systemd
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../lighttpd/files/lighttpd.service | 12 ++++++++++++
meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 14 ++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 0000000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..f473632 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://index.html.lighttpd \
file://lighttpd.conf \
file://lighttpd \
+ file://lighttpd.service \
"
SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,28 @@ EXTRA_OECONF = " \
--disable-static \
"
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
INITSCRIPT_NAME = "lighttpd"
INITSCRIPT_PARAMS = "defaults 70"
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+ sed -i 's,/usr/sbin,${sbindir},g' ${D}${systemd_unitdir}/system/lighttpd.service
+ sed -i 's,/etc,${sysconfdir},g' ${D}${systemd_unitdir}/system/lighttpd.service
+ sed -i 's,/bin,${base_bindir},g' ${D}${systemd_unitdir}/system/lighttpd.service
}
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] rpcbind: Add systemd support
2013-08-01 11:43 [PATCH 1/4] openssh: Add systemd support Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 2/4] lighttpd: " Shakeel, Muhammad
@ 2013-08-01 11:43 ` Shakeel, Muhammad
2013-08-01 12:34 ` Enrico Scholz
2013-08-01 11:43 ` [PATCH 4/4] nfs-utils: " Shakeel, Muhammad
2 siblings, 1 reply; 6+ messages in thread
From: Shakeel, Muhammad @ 2013-08-01 11:43 UTC (permalink / raw)
To: openembedded-core
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
- Remove dependency on meta-systemd
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../rpcbind/rpcbind/rpcbind.service | 13 +++++++++++++
meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 10 +++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 0000000..a028ace
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,13 @@
+[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/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..c73c2c7 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+ file://rpcbind.service \
"
UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +28,7 @@ SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
PR = "r4"
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
PACKAGECONFIG ??= "tcp-wrappers"
PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +36,9 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
INITSCRIPT_NAME = "rpcbind"
INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
do_install_append () {
mv ${D}${bindir} ${D}${sbindir}
@@ -43,4 +47,8 @@ do_install_append () {
-e 's,/sbin/,${sbindir}/,g' \
${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+ sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] nfs-utils: Add systemd support
2013-08-01 11:43 [PATCH 1/4] openssh: Add systemd support Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 2/4] lighttpd: " Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 3/4] rpcbind: " Shakeel, Muhammad
@ 2013-08-01 11:43 ` Shakeel, Muhammad
2013-08-01 12:27 ` Enrico Scholz
2 siblings, 1 reply; 6+ messages in thread
From: Shakeel, Muhammad @ 2013-08-01 11:43 UTC (permalink / raw)
To: openembedded-core
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
- Remove dependency on meta-systemd
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
.../nfs-utils/nfs-utils/nfs-utils.service | 16 ++++++++++++++++
.../nfs-utils/nfs-utils_1.2.8.bb | 13 +++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
new file mode 100644
index 0000000..e480cc8
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rpc.nfsd
+ExecStart=/usr/sbin/rpc.mountd
+ExecStart=/usr/sbin/rpc.statd
+ExecStart=/usr/sbin/exportfs -a
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index 40b897b..4149865 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,8 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
- file://nfsserver"
+ file://nfsserver \
+ file://nfs-utils.service "
SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
SRC_URI[sha256sum] = "1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +32,10 @@ INITSCRIPT_NAME = "nfsserver"
# in the shutdown levels, but that works fine.
INITSCRIPT_PARAMS = "defaults"
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-utils.service"
+SYSTEMD_AUTO_ENABLE = "disable"
# --enable-uuid is need for cross-compiling
EXTRA_OECONF = "--with-statduser=nobody \
@@ -65,6 +69,11 @@ do_install_append () {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${localstatedir}/lib/nfs/statd
install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
+
+ install -d ${D}${systemd_unitdir}/system
+ install ${WORKDIR}/nfs-utils.service ${D}${systemd_unitdir}/system/
+ sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/nfs-utils.service
+
# kernel code as of 3.8 hard-codes this path as a default
install -d ${D}/var/lib/nfs/v4recovery
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 4/4] nfs-utils: Add systemd support
2013-08-01 11:43 ` [PATCH 4/4] nfs-utils: " Shakeel, Muhammad
@ 2013-08-01 12:27 ` Enrico Scholz
0 siblings, 0 replies; 6+ messages in thread
From: Enrico Scholz @ 2013-08-01 12:27 UTC (permalink / raw)
To: openembedded-core; +Cc: muhammad_shakeel-nmGgyN9QBj3QT0dZR+AlfA
"Shakeel, Muhammad"
<muhammad_shakeel-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org> writes:
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
> @@ -0,0 +1,16 @@
> +[Unit]
> +Description=NFS Server
> +Requires=rpcbind.service
> +After=rpcbind.service
> +
> +[Service]
> +Type=oneshot
> +ExecStart=/usr/sbin/rpc.nfsd
> +ExecStart=/usr/sbin/rpc.mountd
> +ExecStart=/usr/sbin/rpc.statd
> +ExecStart=/usr/sbin/exportfs -a
imo, this should be splitted into own units with a way to add custom
options (e.g. '-p').
> install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
> +
> + install -d ${D}${systemd_unitdir}/system
--> tab/space mismatch
Enrico
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/4] rpcbind: Add systemd support
2013-08-01 11:43 ` [PATCH 3/4] rpcbind: " Shakeel, Muhammad
@ 2013-08-01 12:34 ` Enrico Scholz
0 siblings, 0 replies; 6+ messages in thread
From: Enrico Scholz @ 2013-08-01 12:34 UTC (permalink / raw)
To: openembedded-core; +Cc: muhammad_shakeel-nmGgyN9QBj3QT0dZR+AlfA
"Shakeel, Muhammad"
<muhammad_shakeel-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org> writes:
> +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
> ...
> +[Service]
> +Type=forking
> +ExecStart=/usr/sbin/rpcbind
The '-w' option, perhaps '-f' (--> 'Type=forking' can be removed then)
and a general way to add local options would be a good idea.
-->
| EnvironmentFile=-/etc/default/rpcbind
| ExecStart=/sbin/rpcbind -f -w ${RPCBIND_ARGS}
Enrico
--
SIGMA Chemnitz GmbH Registergericht: Amtsgericht Chemnitz HRB 1750
Am Erlenwald 13 Geschaeftsfuehrer: Grit Freitag, Frank Pyritz
09128 Chemnitz
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-01 12:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-01 11:43 [PATCH 1/4] openssh: Add systemd support Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 2/4] lighttpd: " Shakeel, Muhammad
2013-08-01 11:43 ` [PATCH 3/4] rpcbind: " Shakeel, Muhammad
2013-08-01 12:34 ` Enrico Scholz
2013-08-01 11:43 ` [PATCH 4/4] nfs-utils: " Shakeel, Muhammad
2013-08-01 12:27 ` Enrico Scholz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox