CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdma-core: Use target path for systemctl

Browse Source 
Fixes
WARNING: rdma-core-46.0-r0 do_package_qa: QA Issue: File /usr/lib/udev/rules.d/60-srp_daemon.rules in package rdma-core contains reference to TMPDIR

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-05-27 17:29:43 -07:00
parent ecc683bbd8
commit 12cb5d1337
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch Normal file
View File

@ -0,0 +1,33 @@
From 92747aab189aa3cee954ab31ee019205f8984155 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
This allows to encode correct paths which are inside the target rootfs
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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,10 @@ else()
set(CYTHON_EXECUTABLE "")
endif()
-find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin")
+if (NOT SYSTEMCTL_BIN)
+ find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin")
+endif()
+
if (NOT SYSTEMCTL_BIN)
set (SYSTEMCTL_BIN "/bin/systemctl")
endif()
--
2.40.1

4
meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb
View File

@ -5,7 +5,8 @@ SECTION = "libs"
DEPENDS = "libnl"
RDEPENDS:${PN} = "bash perl"
SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https"
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 = "f2789cbd394c5839e8942d585a494ab72fd97e39"
S = "${WORKDIR}/git"
@ -16,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \
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 \
"