Message ID | 20230925131349.12941-1-costamagnagianfranco@yahoo.it |
---|---|
State | Under Review |
Headers | show |
Series | [meta-oe] mosquitto: upgrade 2.0.17 -> 2.0.18 | expand |
On Mon, Sep 25, 2023 at 6:15 AM Gianfranco <costamagna.gianfranco@gmail.com> wrote: > > 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 > --- > .../mosquitto/files/2894.patch | 23 +++++++++++++++++ > .../mosquitto/files/2895.patch | 25 +++++++++++++++++++ > ...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++- > 3 files changed, 51 insertions(+), 1 deletion(-) > create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2894.patch > create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2895.patch > rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.17.bb => mosquitto_2.0.18.bb} (95%) > > diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch > new file mode 100644 > index 000000000..3275e57e3 > --- /dev/null > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch > @@ -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> It will be good to annotate the patch with Signed-off-by and Upstream-Status: https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html?highlight=upstream+status#patch-upstream-status > +--- > + 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) > + > diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch > new file mode 100644 > index 000000000..a9e9c97b8 > --- /dev/null > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch > @@ -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 > diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb > similarity index 95% > rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb > rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb > index 690b6bc12..0c9ccc810 100644 > --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb > +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb > @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson" > SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ > file://mosquitto.init \ > 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 > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#105128): https://lists.openembedded.org/g/openembedded-devel/message/105128 > Mute This Topic: https://lists.openembedded.org/mt/101573484/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hello, since I maintain the same patch set for both Debian, Ubuntu and meta-oe, I would prefer to use cp to keep them in sync between releases... (whenever possible, specially for upstream proposed PRs) If you want me to add it anyway, please let me know! G. On Mon, Sep 25, 2023, 19:58 Khem Raj <raj.khem@gmail.com> wrote: > On Mon, Sep 25, 2023 at 6:15 AM Gianfranco > <costamagna.gianfranco@gmail.com> wrote: > > > > 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 > > --- > > .../mosquitto/files/2894.patch | 23 +++++++++++++++++ > > .../mosquitto/files/2895.patch | 25 +++++++++++++++++++ > > ...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++- > > 3 files changed, 51 insertions(+), 1 deletion(-) > > create mode 100644 > meta-networking/recipes-connectivity/mosquitto/files/2894.patch > > create mode 100644 > meta-networking/recipes-connectivity/mosquitto/files/2895.patch > > rename meta-networking/recipes-connectivity/mosquitto/{ > mosquitto_2.0.17.bb => mosquitto_2.0.18.bb} (95%) > > > > diff --git > a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch > b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch > > new file mode 100644 > > index 000000000..3275e57e3 > > --- /dev/null > > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch > > @@ -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> > > It will be good to annotate the patch with Signed-off-by and > Upstream-Status: > > > https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html?highlight=upstream+status#patch-upstream-status > > > +--- > > + 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) > > + > > diff --git > a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch > b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch > > new file mode 100644 > > index 000000000..a9e9c97b8 > > --- /dev/null > > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch > > @@ -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 > > diff --git a/meta-networking/recipes-connectivity/mosquitto/ > mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/ > mosquitto_2.0.18.bb > > similarity index 95% > > rename from meta-networking/recipes-connectivity/mosquitto/ > mosquitto_2.0.17.bb > > rename to meta-networking/recipes-connectivity/mosquitto/ > mosquitto_2.0.18.bb > > index 690b6bc12..0c9ccc810 100644 > > --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb > > +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb > > @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson" > > SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ > > file://mosquitto.init \ > > 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 > > > > -- > > 2.34.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#105128): > https://lists.openembedded.org/g/openembedded-devel/message/105128 > > Mute This Topic: https://lists.openembedded.org/mt/101573484/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
On Mon, Sep 25, 2023 at 11:59 AM Gianfranco Costamagna <costamagna.gianfranco@gmail.com> wrote: > > Hello, since I maintain the same patch set for both Debian, Ubuntu and meta-oe, I would prefer to use cp to keep them in sync between releases... (whenever possible, specially for upstream proposed PRs) > I like the maintenance part so keep up good job ! > If you want me to add it anyway, please let me know! If it does not hinder your workflow, it would be good to document it the OE/Yocto way but if it does, then leave it as is. > > G. > > On Mon, Sep 25, 2023, 19:58 Khem Raj <raj.khem@gmail.com> wrote: >> >> On Mon, Sep 25, 2023 at 6:15 AM Gianfranco >> <costamagna.gianfranco@gmail.com> wrote: >> > >> > 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 >> > --- >> > .../mosquitto/files/2894.patch | 23 +++++++++++++++++ >> > .../mosquitto/files/2895.patch | 25 +++++++++++++++++++ >> > ...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++- >> > 3 files changed, 51 insertions(+), 1 deletion(-) >> > create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2894.patch >> > create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/2895.patch >> > rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.17.bb => mosquitto_2.0.18.bb} (95%) >> > >> > diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch >> > new file mode 100644 >> > index 000000000..3275e57e3 >> > --- /dev/null >> > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch >> > @@ -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> >> >> It will be good to annotate the patch with Signed-off-by and Upstream-Status: >> >> https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html?highlight=upstream+status#patch-upstream-status >> >> > +--- >> > + 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) >> > + >> > diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch >> > new file mode 100644 >> > index 000000000..a9e9c97b8 >> > --- /dev/null >> > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch >> > @@ -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 >> > diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb >> > similarity index 95% >> > rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb >> > rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb >> > index 690b6bc12..0c9ccc810 100644 >> > --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb >> > +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb >> > @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson" >> > SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ >> > file://mosquitto.init \ >> > 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 >> > >> > -- >> > 2.34.1 >> > >> > >> > -=-=-=-=-=-=-=-=-=-=-=- >> > Links: You receive all messages sent to this group. >> > View/Reply Online (#105128): https://lists.openembedded.org/g/openembedded-devel/message/105128 >> > Mute This Topic: https://lists.openembedded.org/mt/101573484/1997914 >> > Group Owner: openembedded-devel+owner@lists.openembedded.org >> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] >> > -=-=-=-=-=-=-=-=-=-=-=- >> >
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch new file mode 100644 index 000000000..3275e57e3 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch @@ -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) + diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch new file mode 100644 index 000000000..a9e9c97b8 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch @@ -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 diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb similarity index 95% rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb index 690b6bc12..0c9ccc810 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ 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