From 6836446cf59587119441a2d444585f40ceec3831 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 17 Apr 2017 15:06:02 -0500
Subject: Put mosquitto in /usr not /usr/local

---
 .../mosquitto/mosquitto/config_mk.patch            | 12 ++++++
 recipes-connectivity/mosquitto/mosquitto_1.4.bb    |  3 ++
 recipes-extended/monit/monit_5.12.2.bb             | 43 ----------------------
 recipes-extended/monit/monit_5.21.0.bb             | 43 ++++++++++++++++++++++
 4 files changed, 58 insertions(+), 43 deletions(-)
 create mode 100644 recipes-connectivity/mosquitto/mosquitto/config_mk.patch
 delete mode 100644 recipes-extended/monit/monit_5.12.2.bb
 create mode 100644 recipes-extended/monit/monit_5.21.0.bb

diff --git a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
new file mode 100644
index 0000000..8c0494e
--- /dev/null
+++ b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
@@ -0,0 +1,12 @@
+diff -Naur old/config.mk new/config.mk
+--- old/config.mk	2017-04-17 14:33:32.504351936 -0500
++++ new/config.mk	2017-04-17 14:34:27.061557282 -0500
+@@ -240,7 +240,7 @@
+ endif
+ 
+ INSTALL?=install
+-prefix=/usr/local
++prefix=/usr
+ mandir=${prefix}/share/man
+ localedir=${prefix}/share/locale
+ STRIP?=strip
diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 653fdf8..133a0e0 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -1,6 +1,7 @@
 # This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
 # reciped found at:
 # http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
+inherit autotools-brokensep
 SUMMARY = "Open source MQTT v3.5 implemention"
 DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
@@ -19,6 +20,7 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.default \
            file://mosquitto.logrotate.conf \
            file://nostrip.patch \
+           file://config_mk.patch \
            "
 
 SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
@@ -55,6 +57,7 @@ FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \
                ${systemd_unitdir}/system/mosquitto.service \
+               ${sysconfdir}/ \
 "
 
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
diff --git a/recipes-extended/monit/monit_5.12.2.bb b/recipes-extended/monit/monit_5.12.2.bb
deleted file mode 100644
index ddd2ea9..0000000
--- a/recipes-extended/monit/monit_5.12.2.bb
+++ /dev/null
@@ -1,43 +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.12.2.tar.gz \
-           file://monitrc \
-           file://monit.init \
-           file://monit.default \
-           "
-
-SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
-SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
-
-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.21.0.bb b/recipes-extended/monit/monit_5.21.0.bb
new file mode 100644
index 0000000..ddd2ea9
--- /dev/null
+++ b/recipes-extended/monit/monit_5.21.0.bb
@@ -0,0 +1,43 @@
+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.12.2.tar.gz \
+           file://monitrc \
+           file://monit.init \
+           file://monit.default \
+           "
+
+SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
+SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
+
+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"
-- 
cgit v1.2.3