Message ID | 1704722231-31088-1-git-send-email-wangmy@fujitsu.com |
---|---|
State | Under Review |
Headers | show |
Series | [meta-networking] rdma-core: upgrade 48.0 -> 49.0 | expand |
fails to build on musl. http://sprunge.us/Q7mOb6 again its needing a basename patch with musl. On Mon, Jan 8, 2024 at 5:58 AM wangmy <wangmy@fujitsu.com> wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > 0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch > refreshed for 49.0 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...llow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | 10 ++++------ > .../rdma-core/{rdma-core_48.0.bb => rdma-core_49.0.bb} | 2 +- > 2 files changed, 5 insertions(+), 7 deletions(-) > rename meta-networking/recipes-support/rdma-core/{rdma-core_48.0.bb => rdma-core_49.0.bb} (96%) > > diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch > index 03ba87261..84378fd27 100644 > --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch > +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch > @@ -1,4 +1,4 @@ > -From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 > +From 166d97e6ef63dac1941135e97d0c42ce7a8950af Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > Date: Sat, 27 May 2023 17:22:10 -0700 > Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment > @@ -8,15 +8,16 @@ for systemctl > > Upstream-Status: Pending > Signed-off-by: Khem Raj <raj.khem@gmail.com> > + > --- > CMakeLists.txt | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 9b7462861..c4d82fb49 100644 > +index 2c3deef99..ae60f50b0 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > -@@ -226,7 +226,10 @@ else() > +@@ -229,7 +229,10 @@ else() > set(CYTHON_EXECUTABLE "") > endif() > > @@ -28,6 +29,3 @@ index 9b7462861..c4d82fb49 100644 > if (NOT SYSTEMCTL_BIN) > set (SYSTEMCTL_BIN "/bin/systemctl") > endif() > --- > -2.40.1 > - > diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb > similarity index 96% > rename from meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb > rename to meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb > index b9e07604d..1d30c4a15 100644 > --- a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb > +++ b/meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb > @@ -7,7 +7,7 @@ RDEPENDS:${PN} = "bash perl" > > SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ > file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" > -SRCREV = "3e039515b959fea70356b010ed093e43cf360e99" > +SRCREV = "0bffa5d9be9b0ede538f395bf40eb25a84003a49" > S = "${WORKDIR}/git" > > #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#108163): https://lists.openembedded.org/g/openembedded-devel/message/108163 > Mute This Topic: https://lists.openembedded.org/mt/103597113/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-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch index 03ba87261..84378fd27 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -1,4 +1,4 @@ -From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 +From 166d97e6ef63dac1941135e97d0c42ce7a8950af Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 27 May 2023 17:22:10 -0700 Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment @@ -8,15 +8,16 @@ for systemctl Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b7462861..c4d82fb49 100644 +index 2c3deef99..ae60f50b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -226,7 +226,10 @@ else() +@@ -229,7 +229,10 @@ else() set(CYTHON_EXECUTABLE "") endif() @@ -28,6 +29,3 @@ index 9b7462861..c4d82fb49 100644 if (NOT SYSTEMCTL_BIN) set (SYSTEMCTL_BIN "/bin/systemctl") endif() --- -2.40.1 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb similarity index 96% rename from meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb index b9e07604d..1d30c4a15 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_49.0.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" -SRCREV = "3e039515b959fea70356b010ed093e43cf360e99" +SRCREV = "0bffa5d9be9b0ede538f395bf40eb25a84003a49" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md