Patchwork monit: fix rebuild problem

login
register
mail settings
Submitter Jacob Kjaergaard
Date May 6, 2013, 1:14 p.m.
Message ID <1367846055-4296-1-git-send-email-jabk@prevas.dk>
Download mbox | patch
Permalink /patch/241645/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - May 6, 2013, 1:14 p.m.
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>

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
Esben Haabendal - May 6, 2013, 1:29 p.m.
<jabk@prevas.dk> writes:

> From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>
>
> The patch fixes rebuilding monit against newest base and core (3.2 and 3.3 branches respectively(

Thanks, that should close the last known issue on the 3.2 branch :)

Merging to master, and hopefully later on the 3.2.0 release!

/Esben

>
> /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"

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"