From cb8fd323883b74500f70f139befba6a4f7c70d49 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 1 Jun 2017 17:18:00 -0500 Subject: Add ruby-sqlite3 and monit to the factory image --- recipes-core/images/mlinux-factory-image.bb | 11 ++--- recipes-extended/monit/monit_5.21.0.bb | 47 ---------------------- recipes-extended/monit/monit_5.22.0.bb | 51 ++++++++++++++++++++++++ recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb | 21 +++++++--- 4 files changed, 70 insertions(+), 60 deletions(-) delete mode 100644 recipes-extended/monit/monit_5.21.0.bb create mode 100644 recipes-extended/monit/monit_5.22.0.bb diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 9e59bfb..9da3040 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -18,8 +18,8 @@ IMAGE_INSTALL += "sqlite3" IMAGE_INSTALL += "autossh" -# Monit system/process monitor TBD -#IMAGE_INSTALL += "monit" +# Monit system/process monitor +IMAGE_INSTALL += "monit" # LoRa support (MTAC-LORA accessory card) IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb" @@ -61,12 +61,7 @@ python-xml \ # Ruby support IMAGE_INSTALL += "ruby" -# Ruby-sqlite3 build for 2.2 Ruby requires -# ruby-hoe native, which is not in openembedded. -# In Debian the build needs ruby-redcloth, -# rake, ruby-minitest. Openembedded does not -# support this stuff. TBD -#IMAGE_INSTALL += "ruby-sqlite3" +IMAGE_INSTALL += "ruby-sqlite3" IMAGE_INSTALL += "ruby-serialport" # OpenJDK Java runtime diff --git a/recipes-extended/monit/monit_5.21.0.bb b/recipes-extended/monit/monit_5.21.0.bb deleted file mode 100644 index 8bef5c6..0000000 --- a/recipes-extended/monit/monit_5.21.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Monit" -HOMEPAGE = "http://mmonit.com/" -LICENSE = "AGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51" -DEPENDS = "libpam" - -PR = "r1" - -SRC_URI = "http://mmonit.com/monit/dist/monit-5.21.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" - - -inherit autotools - -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 " - -inherit update-rc.d - -INITSCRIPT_NAME = "monit" -INITSCRIPT_PARAMS = "defaults 99 10" - -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/monit.d - install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/ - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit -} - -CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit" diff --git a/recipes-extended/monit/monit_5.22.0.bb b/recipes-extended/monit/monit_5.22.0.bb new file mode 100644 index 0000000..3ad3074 --- /dev/null +++ b/recipes-extended/monit/monit_5.22.0.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "Monit" +HOMEPAGE = "http://mmonit.com/" +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51" +DEPENDS = "libpam zlib openssl" + +PR = "r0" + +SRC_URI = "http://mmonit.com/monit/dist/monit-5.22.0.tar.gz \ + file://monitrc \ + file://monit.init \ + file://monit.default \ + " + +SRC_URI[md5sum] = "768a637b8d23b6cbce271a8ff125c61f" +SRC_URI[sha256sum] = "9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183" + +inherit autotools-brokensep + +EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ + " + +# 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 + +INITSCRIPT_NAME = "monit" +INITSCRIPT_PARAMS = "defaults 99 10" + +do_install_append() { + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/monit.d + install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/ + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit + + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit +} + +CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit" diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb index 35e473c..82998bc 100644 --- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb +++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb @@ -1,17 +1,28 @@ DESCRIPTION = "Ruby bindings for the SQLite3 embedded database" HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby" -LICENSE = "MIT" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec" SECTION = "console/utils" PRIORITY = "optional" + DEPENDS = "ruby sqlite3" -inherit ruby -PR = "r0" +SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}" +S = "${WORKDIR}/git" + +# Position independent code for shared lib +CFLAGS += "-fPIC" -SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;tag=v${PV};branch=1-3-stable;protocol=git" +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK + ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3 +} -S = "${WORKDIR}/git" +do_install() { + install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3 + install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb + install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3 +} FILES_${PN} = "${libdir}/ruby/sqlite3*" FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*" -- cgit v1.2.3