Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../monit/files/enable-etc-monit.d-include.patch | 9 ----
meta-cgl-common/recipes-cgl/monit/files/init | 42 ---------------
meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb | 59 ----------------------
3 files changed, 110 deletions(-)
delete mode 100644 meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
delete mode 100644 meta-cgl-common/recipes-cgl/monit/files/init
delete mode 100644 meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb

diff --git a/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch b/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
deleted file mode 100644
index 23971a1..0000000
--- a/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/monitrc 2014-03-27 13:27:21.000000000 +0100
-+++ b/monitrc 2014-03-31 13:12:49.515395387 +0200
-@@ -248,5 +248,5 @@
- ## It is possible to include additional configuration parts from other files or
- ## directories.
- #
--# include /etc/monit.d/*
-+include /etc/monit.d/*
- #
diff --git a/meta-cgl-common/recipes-cgl/monit/files/init b/meta-cgl-common/recipes-cgl/monit/files/init
deleted file mode 100644
index 325a552..0000000
--- a/meta-cgl-common/recipes-cgl/monit/files/init
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/monit and type
-# > update-rc.d monit defaults 99
-#
-monit=/usr/bin/monit
-pidfile=/var/run/monit.pid
-monit_args="-c /etc/monitrc"
-
-test -x "$monit" || exit 0
-
-case "$1" in
- start)
- echo -n "Starting Monit"
- start-stop-daemon --start --quiet --exec $monit -- $monit_args
- RETVAL=$?
- echo "."
- ;;
- stop)
- echo -n "Stopping Monit"
- start-stop-daemon --stop --quiet --pidfile $pidfile
- RETVAL=$?
- echo "."
- ;;
- restart)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- status)
- $monit $monit_args status
- RETVAL=$?
- echo "."
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-exit $RETVAL
-
diff --git a/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
deleted file mode 100644
index 6ec1a21..0000000
--- a/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Monit is a tool used for system monitoring and error recovery"
-DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \
- processes, programs, files, directories and filesystems on a UNIX system. \
- Monit conducts automatic maintenance and repair and can execute meaningful \
- causal actions in error situations. \
- "
-HOMEPAGE = "http://mmonit.com/monit/"
-
-LICENSE = "AGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-
-DEPENDS = "openssl zlib virtual/crypt"
-
-SRC_URI = "\
- http://mmonit.com/monit/dist/${BP}.tar.gz \
- file://enable-etc-monit.d-include.patch \
- file://init \
- "
-
-SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df"
-SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2"
-
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99"
-
-inherit autotools-brokensep update-rc.d systemd
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "monit.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
-PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
-
-EXTRA_OECONF = "\
- libmonit_cv_setjmp_available=no \
- libmonit_cv_vsnprintf_c99_conformant=no \
- --with-ssl-lib-dir=${STAGING_LIBDIR} \
- --with-ssl-incl-dir=${STAGING_INCDIR} \
- "
-
-do_configure_prepend() {
- rm -rf ${S}/m4
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/init.d/
- install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
-
- install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
- install -m 700 -d ${D}${sysconfdir}/monit.d/
- sed -i -e 's:# set daemon 120:set daemon 120:' \
- -e 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' \
- ${D}${sysconfdir}/monitrc
-
- install -D -m 0644 ${S}/system/startup/monit.service ${D}${systemd_system_unitdir}/monit.service
-}
-
-CONFFILES_${PN} += "${sysconfdir}/monitrc"
--
2.13.3