Add ruby-sqlite3 and monit to the factory image

1 files changed, 15 insertions, 11 deletions

diff --git a/recipes-extended/monit/monit_5.21.0.bb b/recipes-extended/monit/monit_5.22.0.bb
index 8bef5c6..3ad3074 100644
--- a/recipes-extended/monit/monit_5.21.0.bb
+++ b/recipes-extended/monit/monit_5.22.0.bb
@@ -2,30 +2,34 @@ DESCRIPTION = "Monit"
 HOMEPAGE = "http://mmonit.com/"
 LICENSE = "AGPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "libpam"
+DEPENDS = "libpam zlib openssl"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.21.0.tar.gz \
+SRC_URI = "http://mmonit.com/monit/dist/monit-5.22.0.tar.gz \
            file://monitrc \
            file://monit.init \
            file://monit.default \
-	   file://monit-remove-atomic.patch;patch=1;pnum=1 \
-	   file://monit-libtool.patch;patch=1;pnum=1 \
            "
-# file://monit-libtool.patch;patch=1;pnum=1
 
-SRC_URI[md5sum] = "6e300f87fd108d85844cee9a64f0c7fb"
-SRC_URI[sha256sum] = "fbf76163ed4a180854d378af60fed0cdbc5a8772823957234efc182ead10c03c"
+SRC_URI[md5sum] = "768a637b8d23b6cbce271a8ff125c61f"
+SRC_URI[sha256sum] = "9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183"
 
-
-inherit autotools
+inherit autotools-brokensep
 
 EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
                 --with-ssl-incl-dir=${STAGING_INCDIR} \
                 "
 
-EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
+# Regenerate autoconfig generated aclocal.m4/m4 contained in the tarball
+EXTRA_AUTORECONF += " --force"
+
+do_configure_prepend() {
+    rm ${S}/aclocal.m4
+    rm -Rf ${S}/m4
+}
+
+EXTRA_OECONF_append_arm = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
 
 inherit update-rc.d