diff options
| author | Jason Reiss <jreiss@multitech.com> | 2019-08-20 12:25:59 -0500 |
|---|---|---|
| committer | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2020-05-20 19:50:20 +0300 |
| commit | 92d476cc9a981de849883f07b07927e99c8072be (patch) | |
| tree | bcc93ab40b1ee36144dc2fdd61ebfda88dcc8b51 /recipes-connectivity/mosquitto | |
| parent | 30400e029fdf6751d8f0ecc602f65702748e6e82 (diff) | |
| download | meta-mlinux-92d476cc9a981de849883f07b07927e99c8072be.tar.gz meta-mlinux-92d476cc9a981de849883f07b07927e99c8072be.tar.bz2 meta-mlinux-92d476cc9a981de849883f07b07927e99c8072be.zip | |
lora: update LNS to 2.2.30
mosquitto: update to 1.5.1
Diffstat (limited to 'recipes-connectivity/mosquitto')
| -rw-r--r-- | recipes-connectivity/mosquitto/mosquitto/config_mk.patch | 17 | ||||
| -rw-r--r-- | recipes-connectivity/mosquitto/mosquitto_1.5.1.bb (renamed from recipes-connectivity/mosquitto/mosquitto_1.4.9.bb) | 14 |
2 files changed, 25 insertions, 6 deletions
diff --git a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch index 8c0494e..437022c 100644 --- a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch +++ b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch @@ -1,7 +1,18 @@ 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 @@ +@@ -83,9 +83,9 @@ + # Strip executables and shared libraries on install. + WITH_STRIP:=no + + # Build static libraries +-WITH_STATIC_LIBRARIES:=no ++WITH_STATIC_LIBRARIES:=yes + + # Build with async dns lookup support for bridges (temporary). Requires glibc. + #WITH_ADNS:=yes + +@@ -272,7 +272,7 @@ endif INSTALL?=install @@ -10,3 +21,7 @@ diff -Naur old/config.mk new/config.mk mandir=${prefix}/share/man localedir=${prefix}/share/locale STRIP?=strip + + + + diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.9.bb b/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb index a1e7df8..947dcdf 100644 --- a/recipes-connectivity/mosquitto/mosquitto_1.4.9.bb +++ b/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb @@ -19,12 +19,10 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \ file://mosquitto.conf \ file://mosquitto.default \ file://mosquitto.logrotate.conf \ - file://nostrip.patch \ file://config_mk.patch \ " - -SRC_URI[md5sum] = "67943e2c5afebf7329628616eb2c41c5" -SRC_URI[sha256sum] = "1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b" +SRC_URI[md5sum] = "f98c99998a36a234f3a9d9b402b991db" +SRC_URI[sha256sum] = "8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0" export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}" inherit autotools update-rc.d @@ -32,7 +30,7 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "mosquitto" INITSCRIPT_PARAMS = "defaults 70 30" do_compile() { - oe_runmake PREFIX=/usr + WITH_STATIC_LIBRARIES=1 oe_runmake PREFIX=/usr WITH_STATIC_LIBRARIES=1 } do_install() { # oe_runmake DESTDIR=${D} prefix=/usr install @@ -50,6 +48,11 @@ do_install() { install -m 0644 ${WORKDIR}/mosquitto.logrotate.conf ${D}${sysconfdir}/logrotate.d/mosquitto.conf } +do_rm_work() { + echo "skipping" +} + + PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python" CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto" @@ -75,3 +78,4 @@ FILES_${PN}-python = "/usr/lib/python2.7/site-packages" inherit systemd SYSTEMD_SERVICE_${PN} = "mosquitto.service" + |