diff options
author | Moritz Haase <Moritz.Haase@bmw.de> | 2025-07-14 14:09:41 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-15 00:25:31 -0700 |
commit | cafce9517144c73f59e108712a0d328a1a51301e (patch) | |
tree | fc5a402ab201caa8da61a7137aaaf1395c2dabfc | |
parent | b72fb993b37e71f723d9f56359bc421744217b43 (diff) | |
download | meta-openembedded-cafce9517144c73f59e108712a0d328a1a51301e.tar.gz |
sysdig: Allow to build with CMake 4+
The latest release seems to have support to build with CMake 4+, but updating
requires major changes to the recipe and so far I haven't managed to get a build
passing. Thus, apply the 'minimum policy version' override instead and backport
one patch to unblock builds with CMake 4.
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/sysdig/sysdig/0001-update-cmake-Only-add-dependencies-when-we-bundle.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-update-cmake-Only-add-dependencies-when-we-bundle.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-update-cmake-Only-add-dependencies-when-we-bundle.patch new file mode 100644 index 0000000000..93593b6269 --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-update-cmake-Only-add-dependencies-when-we-bundle.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From ed35037e3ba575d9b0d1ef4cd5b6ab9111136922 Mon Sep 17 00:00:00 2001 | ||
2 | From: Moritz Haase <Moritz.Haase@bmw.de> | ||
3 | Date: Mon, 14 Jul 2025 13:57:30 +0200 | ||
4 | Subject: [PATCH] update(cmake): Only add dependencies when we bundle | ||
5 | |||
6 | Only add dependencies for valijson when we're using the bundled version. | ||
7 | |||
8 | Fixes | ||
9 | |||
10 | | CMake Error at falcosecurity-libs/userspace/libsinsp/CMakeLists.txt:184 (add_dependencies): | ||
11 | | The dependency target "valijson" of target "sinsp" does not exist. | ||
12 | |||
13 | when building with CMake 4. | ||
14 | |||
15 | Upstream-Status: Backport [7d850bad002b56ca5e85fffb1f69b4b1cfeddd91] | ||
16 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
17 | --- | ||
18 | userspace/libsinsp/CMakeLists.txt | 4 +++- | ||
19 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt | ||
22 | index 9794a697c..a82f8c0c1 100644 | ||
23 | --- a/userspace/libsinsp/CMakeLists.txt | ||
24 | +++ b/userspace/libsinsp/CMakeLists.txt | ||
25 | @@ -181,7 +181,9 @@ set(SINSP_LIBRARIES | ||
26 | "${JSONCPP_LIB}" | ||
27 | "${CARES_LIB}") | ||
28 | |||
29 | -add_dependencies(sinsp valijson) | ||
30 | +if(USE_BUNDLED_VALIJSON) | ||
31 | + add_dependencies(sinsp valijson) | ||
32 | +endif() | ||
33 | |||
34 | if(WITH_CHISEL AND USE_BUNDLED_LUAJIT) | ||
35 | add_dependencies(sinsp luajit) | ||
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb index b60f9c643c..c988b0af59 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb | |||
@@ -24,9 +24,10 @@ RDEPENDS:${PN} = "bash" | |||
24 | 24 | ||
25 | SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \ | 25 | SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \ |
26 | git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \ | 26 | git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \ |
27 | file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \ | ||
28 | file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \ | 27 | file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \ |
28 | file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \ | ||
29 | file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \ | 29 | file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \ |
30 | file://0001-update-cmake-Only-add-dependencies-when-we-bundle.patch;patchdir=./falcosecurity-libs \ | ||
30 | " | 31 | " |
31 | SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b" | 32 | SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b" |
32 | SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9" | 33 | SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9" |
@@ -35,6 +36,7 @@ SRCREV_FORMAT = "sysdig_falco" | |||
35 | 36 | ||
36 | 37 | ||
37 | EXTRA_OECMAKE = "\ | 38 | EXTRA_OECMAKE = "\ |
39 | -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ | ||
38 | -DBUILD_DRIVER=OFF \ | 40 | -DBUILD_DRIVER=OFF \ |
39 | -DMINIMAL_BUILD=ON \ | 41 | -DMINIMAL_BUILD=ON \ |
40 | -DUSE_BUNDLED_DEPS=OFF \ | 42 | -DUSE_BUNDLED_DEPS=OFF \ |