From a10ba0957910cba5983512fd6a5d867b2916a513 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 7 Feb 2024 09:14:55 +0800 Subject: [PATCH] rdma-core: upgrade 48.0 -> 50.0 Changelog: ============= -Merge pull request #1419 from EdwardSro/pr-update-to-fc39 -Merge pull request #1422 from nmorey/dev/master/min-version -README: Bump minimum supported version to v30.x -Merge pull request #1421 from ffontaine/master -cbuild: Update to Fedora 39 -build: Fix cmake warning -pyverbs: Adapt includes in Fedora 39 [ #5860 ] -pyverbs: Fix runtime warnings in Fedora 39 -pyverbs: Fix compilation error in Fedora 39 -util/udma_barrier.h: fix mips4 build 0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch refreshed for 50.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...ow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | 12 +++++------- .../{rdma-core_48.0.bb => rdma-core_50.0.bb} | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) rename meta-networking/recipes-support/rdma-core/{rdma-core_48.0.bb => rdma-core_50.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 03ba872616..e181ee2872 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 209f346d55eeaf74e21c541d70ec43d39b6c8c3c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 May 2023 17:22:10 -0700 Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment @@ -8,16 +8,17 @@ for systemctl Upstream-Status: Pending Signed-off-by: Khem Raj + --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b7462861..c4d82fb49 100644 +index 98985e7ee..001efb800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -226,7 +226,10 @@ else() - set(CYTHON_EXECUTABLE "") +@@ -237,7 +237,10 @@ else() + endif() endif() -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") @@ -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_50.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_50.0.bb index b9e07604d2..d0f4fd47a5 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_50.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 = "bc6b4bc134532e952fe7f8efc251e1f89b912098" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md