From: Gianfranco Costamagna <[email protected]> Refresh patches, drop patch 3238, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna <[email protected]> Signed-off-by: Gianfranco Costamagna <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 0331499e1f023471173e5d35d29d7ef2362b4aeb) Signed-off-by: Ankur Tyagi <[email protected]> --- .../mosquitto/files/2895.patch | 15 +++++++++-- .../mosquitto/files/3238.patch | 25 ------------------- ...osquitto_2.0.21.bb => mosquitto_2.0.22.bb} | 3 +-- 3 files changed, 14 insertions(+), 29 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/3238.patch rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.21.bb => mosquitto_2.0.22.bb} (96%) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch index 4c39a290b0..d9432e749e 100644 --- a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch @@ -10,8 +10,6 @@ Upstream-Status: Submitted [https://github.com/eclipse-mosquitto/mosquitto/pull/ 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 @@ @@ -25,3 +23,16 @@ index 15ee0d6..c2a330b 100644 [Service] ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf +--- a/service/systemd/mosquitto.service.notify ++++ b/service/systemd/mosquitto.service.notify +@@ -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] + Type=notify diff --git a/meta-networking/recipes-connectivity/mosquitto/files/3238.patch b/meta-networking/recipes-connectivity/mosquitto/files/3238.patch deleted file mode 100644 index 89795f4cd9..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/3238.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2cb8129793b54de7c68efe1a4a8e91c788077a8e Mon Sep 17 00:00:00 2001 -From: "Roger A. Light" <[email protected]> -Date: Thu, 1 May 2025 11:58:23 +0100 -Subject: [PATCH] Fix incorrect reference clock being selected on startup on - Linux. - -Closes #3238. Thanks to Eric Guin and karlri. -Closes #3168. ---- -Upstream-Status: Backport 2.0.22 - src/mosquitto.c | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/mosquitto.c b/src/mosquitto.c -index ff83ef3da..2aea55237 100644 ---- a/src/mosquitto.c -+++ b/src/mosquitto.c -@@ -465,6 +465,7 @@ int main(int argc, char *argv[]) - #endif - struct mosquitto *ctxt, *ctxt_tmp; - -+ mosquitto_time_init(); - #if defined(WIN32) || defined(__CYGWIN__) - if(argc == 2){ - if(!strcmp(argv[1], "run")){ diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.21.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb similarity index 96% rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.21.bb rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb index 86d26304ee..189250ea60 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.21.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb @@ -17,10 +17,9 @@ DEPENDS = "uthash cjson" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://2895.patch \ - file://3238.patch \ " -SRC_URI[sha256sum] = "7ad5e84caeb8d2bb6ed0c04614b2a7042def961af82d87f688ba33db857b899d" +SRC_URI[sha256sum] = "2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68" inherit systemd update-rc.d useradd cmake pkgconfig
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121505): https://lists.openembedded.org/g/openembedded-devel/message/121505 Mute This Topic: https://lists.openembedded.org/mt/116235790/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
