mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
mosquitto: upgrade 2.0.17 -> 2.0.18
Add two patches from Debian, pull requests proposed upstream as 2894 and 2895 to make it start only when board is online, and to fix dynamic websockets link failure Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
ee100d192d
commit
79088766c8
@@ -0,0 +1,23 @@
|
|||||||
|
From: Joachim Zobel <jz-2017@heute-morgen.de>
|
||||||
|
Date: Wed, 13 Sep 2023 09:55:34 +0200
|
||||||
|
Subject: [PATCH] Link correctly with shared websockets library if needed see:
|
||||||
|
https://github.com/eclipse/mosquitto/pull/2751
|
||||||
|
|
||||||
|
Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and Daniel Engberg <daniel.engberg.lists@pyret.net>
|
||||||
|
---
|
||||||
|
src/CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
|
index 9380a04..dce8313 100644
|
||||||
|
--- a/src/CMakeLists.txt
|
||||||
|
+++ b/src/CMakeLists.txt
|
||||||
|
@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
|
||||||
|
link_directories(${mosquitto_SOURCE_DIR})
|
||||||
|
endif (WIN32)
|
||||||
|
else (STATIC_WEBSOCKETS)
|
||||||
|
- set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
|
||||||
|
+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
|
||||||
|
endif (STATIC_WEBSOCKETS)
|
||||||
|
endif (WITH_WEBSOCKETS)
|
||||||
|
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
From: Joachim Zobel <jz-2017@heute-morgen.de>
|
||||||
|
Date: Wed, 13 Sep 2023 10:05:43 +0200
|
||||||
|
Subject: [PATCH] Mosquitto now waits for network-online when starting
|
||||||
|
(Closes: #1036450)
|
||||||
|
|
||||||
|
See: https://github.com/eclipse/mosquitto/issues/2878
|
||||||
|
---
|
||||||
|
service/systemd/mosquitto.service.simple | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/service/systemd/mosquitto.service.simple b/service/systemd/mosquitto.service.simple
|
||||||
|
index 15ee0d6..c2a330b 100644
|
||||||
|
--- a/service/systemd/mosquitto.service.simple
|
||||||
|
+++ b/service/systemd/mosquitto.service.simple
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Mosquitto MQTT Broker
|
||||||
|
Documentation=man:mosquitto.conf(5) man:mosquitto(8)
|
||||||
|
-After=network.target
|
||||||
|
-Wants=network.target
|
||||||
|
+After=network-online.target
|
||||||
|
+Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
|
||||||
+3
-1
@@ -17,9 +17,11 @@ DEPENDS = "uthash cjson"
|
|||||||
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
|
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
|
||||||
file://mosquitto.init \
|
file://mosquitto.init \
|
||||||
file://1571.patch \
|
file://1571.patch \
|
||||||
|
file://2894.patch \
|
||||||
|
file://2895.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f"
|
SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
|
||||||
|
|
||||||
inherit systemd update-rc.d useradd cmake pkgconfig
|
inherit systemd update-rc.d useradd cmake pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user