From patchwork Wed Oct 17 14:39:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Svendsen X-Patchwork-Id: 192071 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 2FF7C2C0084 for ; Thu, 18 Oct 2012 01:40:16 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id BB56540195 for ; Wed, 17 Oct 2012 16:40:14 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 508F13FEFA for ; Wed, 17 Oct 2012 16:40:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2925; q=dns/txt; s=ironport2; t=1350484811; x=1382020811; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=QhPGND7ONZUC3idriljXkTY995dSBBg5tPPsJMsQGyk=; b=XrQJkpWQAFihAFRxwz6nFaMFQXcTIrc1MF1TN1pSVCtnxP/x/9Kdf8QZ 3Nnpu1sQ3o7pUDKmqRWLolX5IGwTWY4ojMe5lxhUp6U1RM3k8i0fA9vhs hxwnGhRMvotxToZ; X-IronPort-AV: E=Sophos;i="4.80,601,1344204000"; d="scan'208";a="1732811" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 17 Oct 2012 16:40:11 +0200 Received: from fire.prevas.dk (172.16.10.61) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.318.1; Wed, 17 Oct 2012 16:40:10 +0200 From: Morten Thunberg Svendsen To: Subject: [PATCH 9/9] monit: Port to OE-lite from OpenEmbedded and upgrade from 4.x to 5.4 Date: Wed, 17 Oct 2012 16:39:57 +0200 Message-ID: X-Mailer: git-send-email 1.7.10 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.10.61] X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/monit/files/monit | 38 ++++++++++++++++++++++++++++++++++++++ recipes/monit/monit.inc | 28 ++++++++++++++++++++++++++++ recipes/monit/monit_5.4.oe | 1 + recipes/monit/monit_5.4.oe.sig | 1 + 4 files changed, 68 insertions(+) create mode 100644 recipes/monit/files/monit create mode 100644 recipes/monit/monit.inc create mode 100644 recipes/monit/monit_5.4.oe create mode 100644 recipes/monit/monit_5.4.oe.sig diff --git a/recipes/monit/files/monit b/recipes/monit/files/monit new file mode 100644 index 0000000..a18bc2e --- /dev/null +++ b/recipes/monit/files/monit @@ -0,0 +1,38 @@ +#! /bin/sh +# +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/recipes/monit/monit.inc b/recipes/monit/monit.inc new file mode 100644 index 0000000..371b064 --- /dev/null +++ b/recipes/monit/monit.inc @@ -0,0 +1,28 @@ +LICENSE = "AGPL-3.0" +DEPENDS = "libssl libpthread libcrypto libdl libcrypt" +RDEPENDS_${PN} = "libssl libpthread libcrypto libc libcrypt" +inherit sysvinit + +SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\ + file://monit" + +RECIPE_FLAGS = "monit_sysvinit_start" +DEFAULT_USE_monit_sysvinit_start = "99" + +inherit autotools-autoreconf + +# Workaround bug in monit config +EXTRA_OECONF = "--with-ssl-lib-dir=${TARGET_SYSROOT}${libdir} --with-ssl-incl-dir=${TARGET_SYSROOT}${includedir}" + +EXTRA_OECONF =+ "--without-pam libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes" + +do_install[postfuncs] += "do_install_fix" +do_install_fix() { + sysvinit_install_script ${SRCDIR}/monit + + #Delete lines with pam + sed -i '/allow.*@/d' ${S}/monitrc + + install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc + install -m 700 -d ${D}${sysconfdir}/monit.d/ +} diff --git a/recipes/monit/monit_5.4.oe b/recipes/monit/monit_5.4.oe new file mode 100644 index 0000000..070e4f7 --- /dev/null +++ b/recipes/monit/monit_5.4.oe @@ -0,0 +1 @@ +require monit.inc diff --git a/recipes/monit/monit_5.4.oe.sig b/recipes/monit/monit_5.4.oe.sig new file mode 100644 index 0000000..22d7fd6 --- /dev/null +++ b/recipes/monit/monit_5.4.oe.sig @@ -0,0 +1 @@ +d497ff61da9d30c286e2a2079538a802e02436c2 monit-5.4.tar.gz