| Message ID | PR3P192MB0714EF98477EEC643F6472BCDAA59@PR3P192MB0714.EURP192.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,dunfell,1/2] zeromq: upgrade 4.3.2 -> 4.3.3 | expand |
Hugo, Is this a bug fix only update? - armin On 2/21/23 12:47 PM, Hugo Simeliere via lists.openembedded.org wrote: > > Refresh the following patch: > > 0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > (cherry picked from commit 117b3f95507b464aafe6a1948cf4a79f26194acb) > > Signed-off-by: Hugo SIMELIERE <hsimeliere.opensource@witekio.com> > > --- > > ...void-host-specific-path-to-libsodium.patch | 19 +++++++++++++------ > > .../{zeromq_4.3.2.bb => zeromq_4.3.3.bb} | 4 ++-- > > 2 files changed, 15 insertions(+), 8 deletions(-) > > rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.3.2.bb => > zeromq_4.3.3.bb} (87%) > > diff --git > a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > index eb3dee4d3..3b0300c8a 100644 > > --- > a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > +++ > b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > @@ -1,6 +1,7 @@ > > +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 > > From: Niko Mauno <niko.mauno@vaisala.com> > > -Date: Wed Apr 22 09:00:00 2020 +0300 > > -Subject: CMakeLists.txt: Avoid host-specific path to libsodium > > +Date: Wed, 22 Apr 2020 09:00:00 +0300 > > +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium > > Avoid propagating full build host specific path to generated > > ZeroMQTargets.cmake when building with libsodium, which changes the > > @@ -17,10 +18,16 @@ Upstream-Status: Pending > > Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> > > +--- > > + CMakeLists.txt | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index e92141d..d0775c1 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > -@@ -1210,7 +1210,7 @@ > > - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} > ${CMAKE_THREAD_LIBS_INIT}) > > +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) > > + endif() > > if(SODIUM_FOUND) > > - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) > > @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> > > # On Solaris, libsodium depends on libssp > > if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") > > target_link_libraries(libzmq ssp) > > -@@ -1240,7 +1240,7 @@ > > - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} > ${CMAKE_THREAD_LIBS_INIT}) > > +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) > > + endif() > > if(SODIUM_FOUND) > > - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) > > diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > similarity index 87% > > rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > > rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > index 02a4c04fd..a10500475 100644 > > --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > > +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > @@ -10,8 +10,8 @@ SRC_URI = > "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} > > file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > <file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch> \ > > file://run-ptest <file://run-ptest> \ > > " > > -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" > > -SRC_URI[sha256sum] = > "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" > > +SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" > > +SRC_URI[sha256sum] = > "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" > > UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases > <https://github.com/$%7bBPN%7d/libzmq/releases>" > > -- > > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101194): https://lists.openembedded.org/g/openembedded-devel/message/101194 > Mute This Topic: https://lists.openembedded.org/mt/97114479/3616698 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hugo, I didn't catch this but this update was already posted 5 days ago. -armin On 2/21/23 12:47 PM, Hugo Simeliere via lists.openembedded.org wrote: > > Refresh the following patch: > > 0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > (cherry picked from commit 117b3f95507b464aafe6a1948cf4a79f26194acb) > > Signed-off-by: Hugo SIMELIERE <hsimeliere.opensource@witekio.com> > > --- > > ...void-host-specific-path-to-libsodium.patch | 19 +++++++++++++------ > > .../{zeromq_4.3.2.bb => zeromq_4.3.3.bb} | 4 ++-- > > 2 files changed, 15 insertions(+), 8 deletions(-) > > rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.3.2.bb => > zeromq_4.3.3.bb} (87%) > > diff --git > a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > index eb3dee4d3..3b0300c8a 100644 > > --- > a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > +++ > b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > > @@ -1,6 +1,7 @@ > > +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 > > From: Niko Mauno <niko.mauno@vaisala.com> > > -Date: Wed Apr 22 09:00:00 2020 +0300 > > -Subject: CMakeLists.txt: Avoid host-specific path to libsodium > > +Date: Wed, 22 Apr 2020 09:00:00 +0300 > > +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium > > Avoid propagating full build host specific path to generated > > ZeroMQTargets.cmake when building with libsodium, which changes the > > @@ -17,10 +18,16 @@ Upstream-Status: Pending > > Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> > > +--- > > + CMakeLists.txt | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index e92141d..d0775c1 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > -@@ -1210,7 +1210,7 @@ > > - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} > ${CMAKE_THREAD_LIBS_INIT}) > > +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) > > + endif() > > if(SODIUM_FOUND) > > - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) > > @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> > > # On Solaris, libsodium depends on libssp > > if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") > > target_link_libraries(libzmq ssp) > > -@@ -1240,7 +1240,7 @@ > > - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} > ${CMAKE_THREAD_LIBS_INIT}) > > +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) > > + endif() > > if(SODIUM_FOUND) > > - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) > > diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > similarity index 87% > > rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > > rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > index 02a4c04fd..a10500475 100644 > > --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb > > +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb > > @@ -10,8 +10,8 @@ SRC_URI = > "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} > > file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch > <file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch> \ > > file://run-ptest <file://run-ptest> \ > > " > > -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" > > -SRC_URI[sha256sum] = > "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" > > +SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" > > +SRC_URI[sha256sum] = > "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" > > UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases > <https://github.com/$%7bBPN%7d/libzmq/releases>" > > -- > > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101194): https://lists.openembedded.org/g/openembedded-devel/message/101194 > Mute This Topic: https://lists.openembedded.org/mt/97114479/3616698 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, Feb 22, 2023 at 05:27 PM, Armin Kuster wrote: > > Hugo, > > I didn't catch this but this update was already posted 5 days ago. > > -armin Hi, Yes sorry it was not the case hen I made the correction locally, I forgot to recheck before sending the email. Best regards, Hugo Simeliere
diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch index eb3dee4d3..3b0300c8a 100644 --- a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch +++ b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch @@ -1,6 +1,7 @@ +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 From: Niko Mauno <niko.mauno@vaisala.com<mailto:niko.mauno@vaisala.com>> -Date: Wed Apr 22 09:00:00 2020 +0300 -Subject: CMakeLists.txt: Avoid host-specific path to libsodium +Date: Wed, 22 Apr 2020 09:00:00 +0300 +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium Avoid propagating full build host specific path to generated ZeroMQTargets.cmake when building with libsodium, which changes the @@ -17,10 +18,16 @@ Upstream-Status: Pending Signed-off-by: Niko Mauno <niko.mauno@vaisala.com<mailto:niko.mauno@vaisala.com>> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e92141d..d0775c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1210,7 +1210,7 @@ - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com<mailto:niko.mauno@vaisala.com>> # On Solaris, libsodium depends on libssp if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") target_link_libraries(libzmq ssp) -@@ -1240,7 +1240,7 @@ - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb similarity index 87% rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb index 02a4c04fd..a10500475 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb @@ -10,8 +10,8 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" -SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" +SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" +SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases<https://github.com/$%7bBPN%7d/libzmq/releases>"