[meta-intel] [meta-intel-iot-middleware][PATCH] mosquitto: update to 1.4.10

Brendan Le Foll brendan.le.foll at intel.com
Wed Jan 4 01:07:53 PST 2017


On Tue, Jan 03, 2017 at 11:07:43AM -0500, Sylvain Lemieux wrote:
> On Wed, 2016-12-07 at 15:29 -0500, Sylvain Lemieux wrote:
> > From: Sylvain Lemieux <slemieux at tycoint.com>
> > 
> > Update mosquitto to version 1.4.10.
> > 
> > Signed-off-by: Sylvain Lemieux <slemieux at tycoint.com>
> > Reviewed-by: Andr?? Draszik <adraszik at tycoint.com>
> > ---
> >  recipes-connectivity/mosquitto/files/build.patch               | 10 ++++++----
> >  .../mosquitto/{mosquitto_1.4.bb => mosquitto_1.4.10.bb}        |  6 +++---
> >  2 files changed, 9 insertions(+), 7 deletions(-)
> >  rename recipes-connectivity/mosquitto/{mosquitto_1.4.bb => mosquitto_1.4.10.bb} (90%)
> > 
> > diff --git a/recipes-connectivity/mosquitto/files/build.patch b/recipes-connectivity/mosquitto/files/build.patch
> > index 78c72cb..8c55c29 100644
> > --- a/recipes-connectivity/mosquitto/files/build.patch
> > +++ b/recipes-connectivity/mosquitto/files/build.patch
> > @@ -16,7 +16,7 @@ diff --git a/client/Makefile b/client/Makefile
> >  index bd65355..4e5a640 100644
> >  --- a/client/Makefile
> >  +++ b/client/Makefile
> > -@@ -24,8 +24,8 @@ client_shared.o : client_shared.c client_shared.h
> > +@@ -24,8 +24,8 @@ client_shared.o : client_shared.c client
> >   
> >   install : all
> >   	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
> > @@ -31,7 +31,7 @@ diff --git a/config.mk b/config.mk
> >  index c0f175f..3427b83 100644
> >  --- a/config.mk
> >  +++ b/config.mk
> > -@@ -240,7 +240,7 @@ ifeq ($(WITH_DOCS),yes)
> > +@@ -241,7 +241,7 @@ ifeq ($(WITH_DOCS),yes)
> >   endif
> >   
> >   INSTALL?=install
> > @@ -44,7 +44,7 @@ diff --git a/lib/Makefile b/lib/Makefile
> >  index 825fcea..9b7c05c 100644
> >  --- a/lib/Makefile
> >  +++ b/lib/Makefile
> > -@@ -25,7 +25,7 @@ all : libmosquitto.so.${SOVERSION} libmosquitto.a
> > +@@ -25,7 +25,7 @@ all : libmosquitto.so.${SOVERSION} libmo
> >   
> >   install : all
> >   	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
> > @@ -70,14 +70,16 @@ diff --git a/src/Makefile b/src/Makefile
> >  index 2cfb7d4..9a97644 100644
> >  --- a/src/Makefile
> >  +++ b/src/Makefile
> > -@@ -103,10 +103,10 @@ mosquitto_passwd.o : mosquitto_passwd.c
> > +@@ -103,12 +103,12 @@ mosquitto_passwd.o : mosquitto_passwd.c
> >   
> >   install : all
> >   	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
> >  -	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
> >  +	$(INSTALL) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
> > +	$(INSTALL) -d ${DESTDIR}$(prefix)/include
> >   	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
> >   ifeq ($(WITH_TLS),yes)
> > +	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
> >  -	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
> >  +	$(INSTALL) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
> >   endif
> > diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
> > similarity index 90%
> > rename from recipes-connectivity/mosquitto/mosquitto_1.4.bb
> > rename to recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
> > index def0c4b..75213c6 100644
> > --- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
> > +++ b/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
> > @@ -5,7 +5,7 @@ SECTION = "console/network"
> >  LICENSE = "BSD"
> >  LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
> >  
> > -DEPENDS = "openssl util-linux python"
> > +DEPENDS = "openssl util-linux c-ares"
> >  
> >  PR = "r0"
> >  
> > @@ -16,8 +16,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
> >  
> >  export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
> >  
> > -SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
> > -SRC_URI[sha256sum] = "591f3adcb6ed92c01f7ace1c878af728b797fe836892535620aa6106f42dbcc6"
> > +SRC_URI[md5sum] = "61839b47b58c5799aab76584f13ed66f"
> > +SRC_URI[sha256sum] = "437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770"
> >  
> >  do_compile() {
> >      oe_runmake PREFIX=/usr
> 
> ping
> 
> 
> Sylvain
> 

Merged. Thanks for the reminder.

Brendan


More information about the meta-intel mailing list