diff options
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | 12 | ||||
| -rw-r--r-- | meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb (renamed from meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb) | 2 |
2 files changed, 6 insertions, 8 deletions
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 @@ | |||
| 1 | From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 | 1 | From 209f346d55eeaf74e21c541d70ec43d39b6c8c3c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 27 May 2023 17:22:10 -0700 | 3 | Date: Sat, 27 May 2023 17:22:10 -0700 |
| 4 | Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment | 4 | Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment |
| @@ -8,16 +8,17 @@ for systemctl | |||
| 8 | 8 | ||
| 9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | |||
| 11 | --- | 12 | --- |
| 12 | CMakeLists.txt | 5 ++++- | 13 | CMakeLists.txt | 5 ++++- |
| 13 | 1 file changed, 4 insertions(+), 1 deletion(-) | 14 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 14 | 15 | ||
| 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 16 | index 9b7462861..c4d82fb49 100644 | 17 | index 98985e7ee..001efb800 100644 |
| 17 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
| 18 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
| 19 | @@ -226,7 +226,10 @@ else() | 20 | @@ -237,7 +237,10 @@ else() |
| 20 | set(CYTHON_EXECUTABLE "") | 21 | endif() |
| 21 | endif() | 22 | endif() |
| 22 | 23 | ||
| 23 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") | 24 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") |
| @@ -28,6 +29,3 @@ index 9b7462861..c4d82fb49 100644 | |||
| 28 | if (NOT SYSTEMCTL_BIN) | 29 | if (NOT SYSTEMCTL_BIN) |
| 29 | set (SYSTEMCTL_BIN "/bin/systemctl") | 30 | set (SYSTEMCTL_BIN "/bin/systemctl") |
| 30 | endif() | 31 | endif() |
| 31 | -- | ||
| 32 | 2.40.1 | ||
| 33 | |||
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 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" | |||
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ |
| 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" | 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" |
| 10 | SRCREV = "3e039515b959fea70356b010ed093e43cf360e99" | 10 | SRCREV = "bc6b4bc134532e952fe7f8efc251e1f89b912098" |
| 11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 12 | 12 | ||
| 13 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md | 13 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md |
