CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

paho-mqtt-c: Update to the real 1.3.2, and correct the license

Browse Source 
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.

Remove do_configure_prepend_libc-musl() as this has now been fixed
upstream.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Kjellerstedt 2020-05-02 22:35:33 +02:00 committed by Khem Raj
parent 76e537ca36
commit 679bb49126
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb
View File

@ -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
}