License file LICENSE is added, therefore use that for checksums license still remains same.
Signed-off-by: Khem Raj <[email protected]> --- ...INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch | 58 +++++++++---------- ...tt-cpp_1.3.2.bb => paho-mqtt-cpp_1.4.1.bb} | 6 +- 2 files changed, 29 insertions(+), 35 deletions(-) rename meta-oe/recipes-connectivity/paho-mqtt-cpp/{paho-mqtt-cpp_1.3.2.bb => paho-mqtt-cpp_1.4.1.bb} (81%) diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch index fba9a8767f..a881c83495 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch @@ -13,47 +13,41 @@ Upstream-Status: Pending src/samples/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index a9f8908..7eadc60 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -11,7 +11,7 @@ export(EXPORT ${package_name} - FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" - NAMESPACE ${package_name}::) - --install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} -+install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} - FILE ${package_name}Targets.cmake - NAMESPACE ${package_name}::) +@@ -34,7 +34,7 @@ export(EXPORT ${package_name} + ) -@@ -19,4 +19,4 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" - FindPahoMqttC.cmake - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" -- DESTINATION lib/cmake/${package_name}) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) -diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt -index 3ca0a75..c915cd5 100644 ---- a/src/samples/CMakeLists.txt -+++ b/src/samples/CMakeLists.txt -@@ -71,7 +71,7 @@ endforeach() + install(EXPORT ${package_name} +- DESTINATION lib/cmake/${package_name} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + FILE ${package_name}Targets.cmake + NAMESPACE ${package_name}:: + ) +@@ -42,5 +42,5 @@ install(EXPORT ${package_name} + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" +- DESTINATION lib/cmake/${package_name} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + ) +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -65,7 +65,7 @@ endforeach() ## install binaries install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} ) ## Build the SSL/TLS samples, if selected -@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL) - endforeach() +@@ -80,7 +80,7 @@ if(PAHO_WITH_SSL) + endforeach() - install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) + install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} + ) endif() --- -2.34.1 - diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb similarity index 81% rename from meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb rename to meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb index 1b2e51c3ac..f374837fc6 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb @@ -5,15 +5,15 @@ SECTION = "console/network" LICENSE = "EPL-2.0 | EDL-1.0" LIC_FILES_CHKSUM = " \ - file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \ + file://LICENSE;md5=c0fa3a632eea67f4079c54df781d1441 \ file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \ +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \ file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ " -SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681" +SRCREV = "c310578ee68d38cd53e79d7107fb41dc68dbafe0" DEPENDS = "openssl paho-mqtt-c"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112096): https://lists.openembedded.org/g/openembedded-devel/message/112096 Mute This Topic: https://lists.openembedded.org/mt/108279327/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
