From patchwork Mon May 6 13:14:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Kjaergaard X-Patchwork-Id: 241645 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 [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 4C4772C00AC for ; Mon, 6 May 2013 23:14:22 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 0A5223F9BB for ; Mon, 6 May 2013 15:14:21 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id ED26A3F9BB for ; Mon, 6 May 2013 15:14:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1436; q=dns/txt; s=ironport1; t=1367846059; x=1399382059; h=from:to:cc:subject:date:message-id:mime-version; bh=w8nehTVv1zRNoNRunhATXZKSklSsP0Kd43hzjT0D5Sg=; b=R/ke94lFXWeGmMXjltCWHvqqVnVX1yXWSrq6coDDj9cLMiOFL8vVyQdd 4Adss9vIu52484JpbGPZoIOEqCFTNXJbWL0XpOsU+UitYuT2fpdnqkur2 R3gUv8SbmWCaOU/2MEfxea30AM7mtV2/vfuPqGpRrDsDgtLci+u40IemO M=; X-IronPort-AV: E=Sophos;i="4.87,621,1363129200"; d="scan'208";a="3055617" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 06 May 2013 15:14:18 +0200 Received: from arh116.prevas.se (172.16.11.10) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.342.3; Mon, 6 May 2013 15:14:17 +0200 From: To: Subject: [PATCH] monit: fix rebuild problem Date: Mon, 6 May 2013 15:14:15 +0200 Message-ID: <1367846055-4296-1-git-send-email-jabk@prevas.dk> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [172.16.11.10] 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 From: Jacob Kjaergaard The patch fixes rebuilding monit against newest base and core (3.2 and 3.3 branches respectively( /Jacob --- recipes/monit/files/fix-rebuild.patch | 14 ++++++++++++++ recipes/monit/monit.inc | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes/monit/files/fix-rebuild.patch diff --git a/recipes/monit/files/fix-rebuild.patch b/recipes/monit/files/fix-rebuild.patch new file mode 100644 index 0000000..34d3011 --- /dev/null +++ b/recipes/monit/files/fix-rebuild.patch @@ -0,0 +1,14 @@ +--- a/libmonit/test/Makefile.am~ 2012-05-06 11:40:45.000000000 +0200 ++++ b/libmonit/test/Makefile.am 2013-05-06 10:58:41.502912238 +0200 +@@ -31,9 +31,6 @@ + + DISTCLEANFILES = *~ + +-distclean-local: +- -rm -f Makefile.in +- + verify: + @/bin/bash ./test.sh + + +Diff finished. Mon May 6 10:58:49 2013 diff --git a/recipes/monit/monit.inc b/recipes/monit/monit.inc index 371b064..3838ee0 100644 --- a/recipes/monit/monit.inc +++ b/recipes/monit/monit.inc @@ -4,7 +4,9 @@ RDEPENDS_${PN} = "libssl libpthread libcrypto libc libcrypt" inherit sysvinit SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\ - file://monit" + file://monit \ + file://fix-rebuild.patch \ + " RECIPE_FLAGS = "monit_sysvinit_start" DEFAULT_USE_monit_sysvinit_start = "99"