From 9f6d45379eb4b32fa8c4e9b86d1f14ace2e7756e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 8 Mar 2020 09:00:06 +0100 Subject: mosquitto: refresh patches and sync with Debian packaging Also add patch from debian to mqtt_protocol.h header file Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../recipes-connectivity/mosquitto/files/1571.patch | 4 +--- .../mosquitto/files/install-protocol.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch (limited to 'meta-networking/recipes-connectivity/mosquitto/files') diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 2cfa48457a..93ff6bcfa6 100644 --- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -9,11 +9,9 @@ Signed-off-by: Gianfranco Costamagna lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f12a..14ba12739 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES +@@ -89,6 +89,8 @@ OUTPUT_NAME mosquitto VERSION ${VERSION} SOVERSION 1 diff --git a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch new file mode 100644 index 0000000000..1397fc6a24 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch @@ -0,0 +1,14 @@ +Description: Also install mqtt_protocol.h, as is done in Makefile +Author: Gianfranco Costamagna +Bug-Debian: https://bugs.debian.org/951116 +Forwarded: https://github.com/eclipse/mosquitto/pull/1599 +Last-Update: 2020-02-15 + +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -114,4 +114,4 @@ + install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + endif (WITH_STATIC_LIBRARIES) + +-install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -- cgit v1.2.3-54-g00ecf