On Thu, Apr 30, 2020 at 6:45 PM Peter Kjellerstedt <[email protected]> wrote: > > In commit b0345e3f (paho-mqtt-c: upgrade 1.3.1 -> 1.3.2), paho-mqtt-c > was supposedly updated to 1.3.2. However, the SRCREV did not match the > v1.3.2 tag. > > With the update to 1.3.2, the license was changed from EPL-1.0 | EDL-1.0 > to EPL-2.0 | EDL-1.0. This was updated in commit b0345e3f for > LIC_FILES_CHKSUM, but not in LICENSE. > > Signed-off-by: Peter Kjellerstedt <[email protected]> > --- > .../paho-mqtt-c/paho-mqtt-c_1.3.2.bb | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb > b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb > index fa8c714ce..071d51fc6 100644 > --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb > +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb > @@ -2,19 +2,19 @@ SUMMARY = "Paho MQTT - C libraries for the MQTT and MQTT-SN > protocols" > DESCRIPTION = "Client implementation of open and standard messaging > protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." > HOMEPAGE = "http://www.eclipse.org/paho/"; > SECTION = "console/network" > -LICENSE = "EPL-1.0 | EDL-1.0" > +LICENSE = "EPL-2.0 | EDL-1.0" > > LIC_FILES_CHKSUM = " \ > - file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ > - file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ > - file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ > - file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ > + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ > + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ > + file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ > + file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ > " > > SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http \ > file://0001-Fix-bug-of-free-with-musl.patch" > > -SRCREV = "fbe39064c4416f879308a8a5390b19d544970789" > +SRCREV = "3148fe2d5f4b87e16266dfe559c0764e16ca0546" > > DEPENDS = "openssl" > > @@ -29,7 +29,3 @@ do_install_append() { > } > > EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" > - > -do_configure_prepend_libc-musl() { > - sed -i -e "s/SET(LIBS_SYSTEM c dl pthread anl rt)/SET(LIBS_SYSTEM c dl > pthread rt)/g" ${S}/src/CMakeLists.txt > -} > --
You are also removing do_configure_prepend_libc-musl(), but the reason for this isn't mentioned in the commit message. Steve > 2.21.1 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#84184): https://lists.openembedded.org/g/openembedded-devel/message/84184 Mute This Topic: https://lists.openembedded.org/mt/73391468/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/leave/8024792/1994799631/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
