Re: [OE-core] [PATCH] [thud][PATCH] mdadm: add init and service scripts

2019-01-22 Thread Burton, Ross
On Fri, 18 Jan 2019 at 03:08, Hong Liu  wrote:
> +do_install_append() {
> +install -d ${D}/${sysconfdir}/
> +install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
> +if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
> then

systemd.bbclass will delete these if systemd isn't enabled, so there's
no need to guard them.

> ++FILES_${PN} += " \
> +${systemd_unitdir} \
> +"

I believe systemd.bbclass does this too.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] [thud][PATCH] mdadm: add init and service scripts

2019-01-17 Thread Hong Liu
Add init script and service file for sysvinit and systemd.

Signed-off-by: Hong Liu 
---
 meta/recipes-extended/mdadm/files/mdadm.init | 72 
 meta/recipes-extended/mdadm/mdadm_4.0.bb | 23 ++-
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init

diff --git a/meta/recipes-extended/mdadm/files/mdadm.init 
b/meta/recipes-extended/mdadm/files/mdadm.init
new file mode 100644
index 00..cab91b9acc
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.init
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Start the MD monitor daemon for all active MD arrays if desired.
+#
+### BEGIN INIT INFO
+# Provides:  mdadm
+# Required-Start:$local_fs $syslog mdadm-raid
+# Required-Stop: $local_fs $syslog mdadm-raid
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: MD monitoring daemon
+# Description:   mdadm provides a monitor mode, in which it will scan for
+#problems with the MD devices. If a problem is found, the
+#administrator is alerted via email, or a custom script is
+#run.
+### END INIT INFO
+#
+
+MDADM=/sbin/mdadm
+RUNDIR=/var/run/mdadm
+PIDFILE=$RUNDIR/monitor.pid
+DEBIANCONFIG=/etc/default/mdadm
+
+test -x "$MDADM" || exit 0
+
+test -f /proc/mdstat || exit 0
+
+START_DAEMON=true
+test -f $DEBIANCONFIG && . $DEBIANCONFIG
+
+. /lib/lsb/init-functions
+
+# Include functions
+. /etc/init.d/functions
+
+case "${1:-}" in
+  start)
+if is_true $START_DAEMON; then
+  log_daemon_msg "Starting MD monitoring service" "mdadm --monitor"
+  mkdir -p $RUNDIR
+  start-stop-daemon -S -p $PIDFILE -x $MDADM -- \
+--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-}
+  RETVAL=$?
+  log_end_msg $RETVAL
+  exit $RETVAL
+fi
+;;
+  stop)
+if [ -f $PIDFILE ] ; then
+  log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor"
+  start-stop-daemon -K -p $PIDFILE -x $MDADM
+  RETVAL=$?
+  rm -f $PIDFILE
+  log_end_msg $RETVAL
+  exit $RETVAL
+fi
+;;
+  status)
+status -p $PIDFILE "$MDADM" && exit 0 || exit $?
+;;
+  restart|reload|force-reload)
+${0:-} stop
+${0:-} start
+;;
+  *)
+echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2
+exit 1
+;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb 
b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index 2c4d88a9e7..c59829b1fc 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.0.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb
@@ -24,12 +24,13 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \

file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \

file://0001-use-memmove-instead-of-memcpy-on-overlapping-region.patch \
file://0001-Disable-gcc8-warnings.patch \
+   file://mdadm.init \
"
 SRC_URI[md5sum] = "2cb4feffea9167ba71b5f346a0c0a40d"
 SRC_URI[sha256sum] = 
"1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9"
 
 CFLAGS += "-fno-strict-aliasing"
-inherit autotools-brokensep
+inherit autotools-brokensep ptest systemd
 
 EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
 # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's 
asm/types.h
@@ -51,7 +52,20 @@ do_install() {
autotools_do_install
 }
 
-inherit ptest
+do_install_append() {
+install -d ${D}/${sysconfdir}/
+install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
+if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
+install -d ${D}/${systemd_unitdir}/system
+install -m 644 ${S}/systemd/mdmonitor.service 
${D}/${systemd_unitdir}/system
+fi
+
+install -d ${D}/${sysconfdir}/init.d
+install -m 755 ${WORKDIR}/mdadm.init${D}${sysconfdir}/init.d/mdmonitor
+}
+
+SYSTEMD_SERVICE_${PN} = "mdmonitor.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 do_compile_ptest() {
oe_runmake test
@@ -67,6 +81,11 @@ do_install_ptest() {
install -D -m 755 $prg ${D}${PTEST_PATH}/
done
 }
+
++FILES_${PN} += " \
+${systemd_unitdir} \
+"
+
 RDEPENDS_${PN}-ptest += "bash"
 RRECOMMENDS_${PN}-ptest += " \
 coreutils \
-- 
2.17.2



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core