From a10ba0957910cba5983512fd6a5d867b2916a513 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 7 Feb 2024 09:14:55 +0800 Subject: 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 --- ...-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | 12 +++--- .../recipes-support/rdma-core/rdma-core_48.0.bb | 44 ---------------------- .../recipes-support/rdma-core/rdma-core_50.0.bb | 44 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb 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_48.0.bb deleted file mode 100644 index b9e07604d2..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Userspace support for InfiniBand/RDMA verbs" -DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." -SECTION = "libs" - -DEPENDS = "libnl" -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" -S = "${WORKDIR}/git" - -#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ - -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ - -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ - -DNO_MAN_PAGES=1 \ -" - -LTO = "" - -FILES_SOLIBSDEV = "" -FILES:${PN} += "${libdir}/*" -INSANE_SKIP:${PN} += "dev-so" - -inherit cmake cpan-base pkgconfig python3native python3targetconfig systemd - -SYSTEMD_SERVICE:${PN} = " \ - srp_daemon.service \ - iwpmd.service \ - ibacm.socket \ - rdma-load-modules@.service \ - srp_daemon_port@.service \ - rdma-hw.target \ - ibacm.service \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb new file mode 100644 index 0000000000..d0f4fd47a5 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +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 = "bc6b4bc134532e952fe7f8efc251e1f89b912098" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ +" + +LTO = "" + +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/*" +INSANE_SKIP:${PN} += "dev-so" + +inherit cmake cpan-base pkgconfig python3native python3targetconfig systemd + +SYSTEMD_SERVICE:${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" -- cgit v1.2.3-54-g00ecf