From 127e2c487872eb9ca664084c568549289f23800e Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 28 Mar 2017 12:21:20 -0500
Subject: Merge mLinux mosquitto recipe with Yocto MQTT 3.1

---
 recipes-connectivity/mosquitto/mosquitto_1.4.bb | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'recipes-connectivity/mosquitto')

diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 3f035a7..4403643 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -1,3 +1,6 @@
+# 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
 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/"
@@ -8,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
 # util-linux is needed to provide libuuid dependancy
 DEPENDS = "c-ares openssl util-linux"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.init \
@@ -21,13 +24,18 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
 SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
 SRC_URI[sha256sum] = "591f3adcb6ed92c01f7ace1c878af728b797fe836892535620aa6106f42dbcc6"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "mosquitto"
-INITSCRIPT_PARAMS = "defaults 70 30"
+export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
+#inherit autotools update-rc.d
 
+#INITSCRIPT_NAME = "mosquitto"
+#INITSCRIPT_PARAMS = "defaults 70 30"
+do_compile() {
+    oe_runmake PREFIX=/usr
+}
 do_install() {
-    oe_runmake DESTDIR=${D} prefix=/usr install
+    # oe_runmake DESTDIR=${D} prefix=/usr install
+	oe_runmake install DESTDIR=${D}
+	install -m 0755 -d ${D}/usr/lib
     install -m 0644 lib/libmosquitto.a ${D}${libdir}/
 
     install -d ${D}${sysconfdir}/init.d
@@ -45,7 +53,8 @@ PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python"
 CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto"
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
-               ${sysconfdir} \
+               ${sysconfdir}/mosquitto \
+               ${systemd_unitdir}/system/mosquitto.service \
 "
 
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
@@ -60,3 +69,6 @@ FILES_${PN}-staticdev += "${libdir}/libmosquitto.a"
 
 FILES_${PN}-python = "/usr/lib/python2.7/site-packages"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "mosquitto.service"
-- 
cgit v1.2.3