summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-04-17 15:06:02 -0500
committerJohn Klug <john.klug@multitech.com>2017-05-23 15:21:54 -0500
commit6836446cf59587119441a2d444585f40ceec3831 (patch)
tree948157cefbba1d7ede1366940266c992d14b11fb
parent5e19029437fa71ef531f53ccbb76d8791d69d89f (diff)
downloadmeta-mlinux-6836446cf59587119441a2d444585f40ceec3831.tar.gz
meta-mlinux-6836446cf59587119441a2d444585f40ceec3831.tar.bz2
meta-mlinux-6836446cf59587119441a2d444585f40ceec3831.zip
Put mosquitto in /usr not /usr/local
-rw-r--r--recipes-connectivity/mosquitto/mosquitto/config_mk.patch12
-rw-r--r--recipes-connectivity/mosquitto/mosquitto_1.4.bb3
-rw-r--r--recipes-extended/monit/monit_5.21.0.bb (renamed from recipes-extended/monit/monit_5.12.2.bb)0
3 files changed, 15 insertions, 0 deletions
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.21.0.bb
index ddd2ea9..ddd2ea9 100644
--- a/recipes-extended/monit/monit_5.12.2.bb
+++ b/recipes-extended/monit/monit_5.21.0.bb