diff options
| author |   Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2020-03-08 09:00:06 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-03-08 16:38:30 -0700 |
| commit | 9f6d45379eb4b32fa8c4e9b86d1f14ace2e7756e (patch) | |
| tree | 889244dfe45e7d0ad7f5e14e10f346b7373a6248 /meta-networking | |
| parent | 7e6305da8e4e390be6c8065ff98b01b4128d8416 (diff) | |
| download | meta-openembedded-contrib-9f6d45379eb4b32fa8c4e9b86d1f14ace2e7756e.tar.gz | |
mosquitto: refresh patches and sync with Debian packaging
Also add patch from debian to mqtt_protocol.h header file
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
3 files changed, 16 insertions, 3 deletions
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 <costamagnagianfranco@yahoo.it> 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 <locutusofborg@debian.org> +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}") diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb index 0d840e938b..a0321a36fc 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb @@ -17,6 +17,7 @@ DEPENDS = "uthash" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://1571.patch \ + file://install-protocol.patch \ " SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" |