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-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 2cfa48457..93ff6bcfa 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> | |||
9 | lib/CMakeLists.txt | 2 ++ | 9 | lib/CMakeLists.txt | 2 ++ |
10 | 1 file changed, 2 insertions(+) | 10 | 1 file changed, 2 insertions(+) |
11 | 11 | ||
12 | diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | ||
13 | index e1521f12a..14ba12739 100644 | ||
14 | --- a/lib/CMakeLists.txt | 12 | --- a/lib/CMakeLists.txt |
15 | +++ b/lib/CMakeLists.txt | 13 | +++ b/lib/CMakeLists.txt |
16 | @@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES | 14 | @@ -89,6 +89,8 @@ |
17 | OUTPUT_NAME mosquitto | 15 | OUTPUT_NAME mosquitto |
18 | VERSION ${VERSION} | 16 | VERSION ${VERSION} |
19 | SOVERSION 1 | 17 | 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 000000000..1397fc6a2 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Description: Also install mqtt_protocol.h, as is done in Makefile | ||
2 | Author: Gianfranco Costamagna <locutusofborg@debian.org> | ||
3 | Bug-Debian: https://bugs.debian.org/951116 | ||
4 | Forwarded: https://github.com/eclipse/mosquitto/pull/1599 | ||
5 | Last-Update: 2020-02-15 | ||
6 | |||
7 | --- a/lib/CMakeLists.txt | ||
8 | +++ b/lib/CMakeLists.txt | ||
9 | @@ -114,4 +114,4 @@ | ||
10 | install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
11 | endif (WITH_STATIC_LIBRARIES) | ||
12 | |||
13 | -install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
14 | +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 0d840e938..a0321a36f 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" | |||
17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ | 17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ |
18 | file://mosquitto.init \ | 18 | file://mosquitto.init \ |
19 | file://1571.patch \ | 19 | file://1571.patch \ |
20 | file://install-protocol.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" | 23 | SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" |