From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C529C433EF for ; Mon, 25 Apr 2022 16:46:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A951982640; Mon, 25 Apr 2022 16:46:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nCkF5Cp1WCSQ; Mon, 25 Apr 2022 16:46:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 2205B82457; Mon, 25 Apr 2022 16:46:35 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DF1FD1BF31C for ; Mon, 25 Apr 2022 16:46:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CC20E60C07 for ; Mon, 25 Apr 2022 16:46:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=linux.microsoft.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hwZxGve7XYFo for ; Mon, 25 Apr 2022 16:46:31 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp3.osuosl.org (Postfix) with ESMTP id AA9AE605E8 for ; Mon, 25 Apr 2022 16:46:31 +0000 (UTC) Received: from pwmachine.localnet (unknown [92.186.13.154]) by linux.microsoft.com (Postfix) with ESMTPSA id 7175720DEE20; Mon, 25 Apr 2022 09:46:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7175720DEE20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1650905191; bh=Y4bi8IsRVBCeg3G8h8+teSHL1ywsC7vfQVhBasdWPjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rvzL+wlmLyyZlm8SPpLTx9VA3W+4QGrXvFcoNx61wH0M94+XiEgCoiVBg8/depmA7 KmxNlRp0ipziAdiAc9lN+Jod6HF5gNbKhF9Oii6ISyig9W+2WCbfhXy+KmI/qboSYl 9BMTYobn6Y3Oe4beSpF/TW5KAp4HOhwhDTjhA/vY= From: Francis Laniel To: buildroot@buildroot.org, Arnout Vandecappelle Date: Mon, 25 Apr 2022 17:46:26 +0100 Message-ID: <5815204.lOV4Wx5bFT@pwmachine> Organization: Microsoft In-Reply-To: References: <20220422143134.28561-1-flaniel@linux.microsoft.com> <20220422143134.28561-3-flaniel@linux.microsoft.com> MIME-Version: 1.0 Subject: Re: [Buildroot] [RFC PATCH v3 2/2] package/sysdig: bump to 0.29.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci , Samuel Martin , "Yann E . MORIN" Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Le vendredi 22 avril 2022, 23:48:43 BST Arnout Vandecappelle a =E9crit : > Hi Francis, Hi! > Thanks for continuing to work on this! You are welcome! > On 22/04/2022 16:31, Francis Laniel wrote: > > sysdig 0.27.1 cannot be cross-compiled to, e.g., aarch64 because it uses > > open() syscall [1]. > > This patch bumps its version to enable cross-compilation. > > = > > By doing so, we can remove the previous patches. > > But this commit introduces new patches. > > Indeed, libsinsp (lib system inspection), libscap (lib system capture) = and > > the kernel module were moved to falcosecurity/libs. > > Sadly, it is not possible to compile sysdig with pre-compiled libs (like > > we do in buildroot). > > So, this contribution introduces a new patch to build sysdig with alrea= dy > > built falcosecurity/libs. > > = > > [1] https://marc.info/?l=3Dbuildroot&m=3D164951521629400 > > = > > Signed-off-by: Francis Laniel > > --- > > = > > ...BUNDLED_DEPS-before-getting-nlohmann.patch | 51 ++++++++++++ > > ...ATCH_COMMAND-to-fix-lua-types-and-fu.patch | 82 ------------------- > > ...gainst-libabseil-cpp-which-grpc-uses.patch | 47 ----------- > > ...e-Add-libsinsp.a-as-IMPORTED-library.patch | 59 +++++++++++++ > > package/sysdig/Config.in | 31 ++----- > > package/sysdig/sysdig.hash | 4 +- > > package/sysdig/sysdig.mk | 55 ++++++------- > > 7 files changed, 141 insertions(+), 188 deletions(-) > > create mode 100644 > > package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohm= an > > n.patch delete mode 100644 > > package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and= -f > > u.patch delete mode 100644 > > package/sysdig/0002-Link-against-libabseil-cpp-which-grpc-uses.patch > > create mode 100644 > > package/sysdig/0002-cmake-Add-libsinsp.a-as-IMPORTED-library.patch> = > > diff --git > > a/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohm= an > > n.patch > > b/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohm= an > > n.patch new file mode 100644 > > index 0000000000..29f03b1b61 > > --- /dev/null > > +++ > > b/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohm= an > > n.patch @@ -0,0 +1,51 @@ > > +From 0dbebd008c04d266dc41c4bec8280a0744fd5130 Mon Sep 17 00:00:00 2001 > > +From: Francis Laniel > > +Date: Wed, 13 Apr 2022 18:01:11 +0100 > > +Subject: [PATCH 1/2] cmake: Check USE_BUNDLED_DEPS before getting > = > There should be no N/M in patches. check-package reports this. > = > > + nlohmann-json. > > + > > +Signed-off-by: Francis Laniel > = > Please send your patches upstream (i.e. create a merge request on the > sysdig project) before even sending it to Buildroot, and add > = > Upstream: https://github.com/... > = > to the patch you submit to Buildroot. > = > This way, it's easier to find if the patch can be removed when the pack= age > version is bumped. > = > Also, for reviewing, it allows us to check if upstream has any comments= on > the patch. Upstream generally has a better idea of how things are supposed > to work than we do. And if they end up committing an alternative approach, > we can simply pick that one (while committing) instead of the one you > submitted. > > +--- > > + cmake/modules/nlohmann-json.cmake | 29 +++++++++++++++++++---------- > > + 1 file changed, 19 insertions(+), 10 deletions(-) > > + > > +diff --git a/cmake/modules/nlohmann-json.cmake > > b/cmake/modules/nlohmann-json.cmake +index bb1279d7..feb0f071 100644 > > +--- a/cmake/modules/nlohmann-json.cmake > > ++++ b/cmake/modules/nlohmann-json.cmake > > +@@ -16,13 +16,22 @@ > > + # limitations under the License. > > + # > > + > > +-set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") > > +-message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") > > +-set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") > > +-ExternalProject_Add( > > +- njson > > +- URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" > > +- URL_HASH > > "SHA256=3D2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa= 801" > > +- CONFIGURE_COMMAND "" > > +- BUILD_COMMAND "" > > +- INSTALL_COMMAND "") > > ++if(NOT USE_BUNDLED_DEPS) > > ++ find_path(NJSON_INCLUDE_DIR NAMES nlohmann/json.hpp) > > ++ if(NJSON_INCLUDE_DIR) > > ++ message(STATUS "Found njson: include: ${NJSON_INCLUDE_DIR}") > > ++ else() > > ++ message(FATAL_ERROR "Couldn't find system njson") > > ++ endif() > > ++else() > > ++ set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") > > ++ message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") > > ++ set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") > > ++ ExternalProject_Add( > > ++ njson > > ++ URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" > > ++ URL_HASH > > "SHA256=3D2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa= 801" > > ++ CONFIGURE_COMMAND "" > > ++ BUILD_COMMAND "" > > ++ INSTALL_COMMAND "") > > ++endif() > > +-- > > +2.25.1 > > + > > diff --git > > a/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and= -f > > u.patch > > b/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and= -f > > u.patch deleted file mode 100644 > > index 7873210281..0000000000 > > --- > > a/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and= -f > > u.patch +++ /dev/null > > @@ -1,82 +0,0 @@ > > -From cc8bccc3ebb90103900a7f0f2b085ddb723b8792 Mon Sep 17 00:00:00 2001 > > -From: Francis Laniel > > -Date: Wed, 6 Apr 2022 16:54:37 +0100 > > -Subject: [PATCH] libsinsp: Apply PATCH_COMMAND to fix lua types and > > function. - > > -Buildroot luajit 5.1 seems to not have compatibility between luaL_reg = and > > -luaL_Reg. > > -So, we apply sysdig CMakeLists.txt PATCH_COMMAND to fix this and lua > > function -call as well. > > -Note that, this PATCH_COMMAND was added in sysdig in: > > -a064440394c9 ("Adding power support to Travis builds (#1566)") > > - > > -This patch is also present in kubernetes/minikube in: > > -f036c279bc59 ("Add patch for compiling sysdig with system luajit") > = > You didn't apply this patch to falcosecurity-libs. Is it no longer need= ed > there? I normally took into account all your comments in v4 I just sent. I just wanted to precise here that the patch regarding luajit is indeed no = more needed in falcosecurity-libs because they use luaL_Reg. > [snip] > = > > diff --git > > a/package/sysdig/0002-cmake-Add-libsinsp.a-as-IMPORTED-library.patch > > b/package/sysdig/0002-cmake-Add-libsinsp.a-as-IMPORTED-library.patch new > > file mode 100644 > > index 0000000000..30601c2430 > > --- /dev/null > > +++ b/package/sysdig/0002-cmake-Add-libsinsp.a-as-IMPORTED-library.patch > > @@ -0,0 +1,59 @@ > > +From e681028c5567582f9c66cf2b11234ab3a1cacc73 Mon Sep 17 00:00:00 2001 > > +From: Francis Laniel > > +Date: Fri, 15 Apr 2022 14:17:48 +0100 > > +Subject: [PATCH 2/2] cmake: Add libsinsp.a as IMPORTED library. > > + > > +libsinsp.a is created by falcosecurity/libs which is downloaded while > > building +sysdig. > > + > > +In buildroot, we do not want to depend of external download. > > +This patch adds libsinsp.a as IMPORTER library and links all its > > dependencies +against it. > > + > > +Signed-off-by: Francis Laniel > > +--- > > + userspace/sysdig/CMakeLists.txt | 28 ++++++++++++++++++++++++++++ > > + 1 file changed, 28 insertions(+) > > + > > +diff --git a/userspace/sysdig/CMakeLists.txt > > b/userspace/sysdig/CMakeLists.txt +index 401d65e3..ef339b71 100644 > > +--- a/userspace/sysdig/CMakeLists.txt > > ++++ b/userspace/sysdig/CMakeLists.txt > > +@@ -86,6 +86,34 @@ target_include_directories( > > + if(NOT WIN32) > > + include_directories(${PROJECT_BINARY_DIR}/driver/src) > > + > > ++ if(SCAP_STATIC_LIBRARY_PATH AND SINSP_STATIC_LIBRARY_PATH) > = > If you add new CMake variables, use the SET command to define them and > give them a help text. > = > However, is it necessary to set them? Can't you just use find_library to > find them in the sysroot? It's basically the same approach as for finding > the JSON library in the other patch. > = > Except... Apparently falcosecurity-libs doesn't actually install its > stuff. It really is meant to be used as a submodule. > = > OK, it looks like this is really trying to fight upstream too much. So > then it's probably better to revert to your earlier proposal: turn > falcosecurity-libs into a generic package that just downloads stuff and > doesn't install, and do the build from the sysdig build. I think, since > it's not using in-tree build, that it doesn't even write anything in the > falcosecurity-libs source directory, right? So the ugliness is rather > limited... > = > > ++ find_library(ABSL_SYNC_LIB NAMES absl_synchronization) > > ++ find_library(B64_LIB NAMES b64) > > ++ find_library(CARES_LIB NAMES cares) > > ++ find_library(ELF_LIB NAMES elf) > > ++ find_library(GTEST_LIB NAMES gtest) > > ++ find_library(JQ_LIB NAMES jq) > > ++ find_library(JSONCPP_LIB NAMES jsoncpp) > > ++ find_library(LUAJIT_LIB NAMES luajit luajit-5.1) > > ++ find_library(PROTOBUF_LIB NAMES protobuf) > > ++ find_library(TBB_LIB NAMES tbb) > > ++ find_library(ZLIB_LIB NAMES z) > > ++ > > ++ find_package(CURL REQUIRED) > > ++ find_package(gRPC REQUIRED) > > ++ find_package(OpenSSL REQUIRED) > > ++ > > ++ set(GPR_LIB gRPC::gpr) > > ++ set(GRPC_LIB gRPC::grpc) > > ++ set(GRPCPP_LIB gRPC::grpc++) > > ++ > > ++ add_library(sinsp STATIC IMPORTED) > > ++ set_target_properties(sinsp PROPERTIES > > ++ IMPORTED_LOCATION "${SINSP_STATIC_LIBRARY_PATH}" > > ++ INTERFACE_LINK_LIBRARIES > > "${ABSL_SYNC_LIB};${B64_LIB};${CARES_LIB};${CURL_LIBRARIES};${ELF_LIB};= ${ > > GPR_LIB};${GRPC_LIB};${GRPCPP_LIB};${GTEST_LIB};${JQ_LIB};${JSONCPP_LIB= };$ > > {LUAJIT_LIB};${OPENSSL_LIBRARIES};${PROTOBUF_LIB};${TBB_LIB};${SCAP_STA= TIC > > _LIBRARY_PATH};${ZLIB_LIB}" ++ ) > > ++ endif() > > ++ > > + target_link_libraries(sysdig > > + sinsp > > + "${YAMLCPP_LIB}") > > +-- > > +2.25.1 > > + > > diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in > > index c124054105..e00516a2b5 100644 > > --- a/package/sysdig/Config.in > > +++ b/package/sysdig/Config.in > > @@ -1,26 +1,11 @@ > > = > > config BR2_PACKAGE_SYSDIG > > = > > bool "sysdig" > > = > > - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf > > = > > depends on BR2_LINUX_KERNEL > > = > > - depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb > > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf > > - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, jq, protobuf, tbb > > - depends on !BR2_STATIC_LIBS # elfutils, protobuf, tbb > > - depends on BR2_USE_WCHAR # elfutils > > - depends on BR2_TOOLCHAIN_USES_GLIBC # elfutils > > - depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 > = > All these dependencies should still stay, they just become indirect > dependencies. > = > Except, if you don't do any actual build of falcosecurity-libs and only= do > it in sysdig, then all these dependencies and selects should also stay in > sysdig. > = > Also, you should not make falcosecurity-libs a user-selectable option in > that case. It still would need a Config.in entry, but without prompt. > = > > - select BR2_PACKAGE_C_ARES > - select BR2_PACKAGE_ELFUTILS > > - select BR2_PACKAGE_GRPC > > - select BR2_PACKAGE_JQ > > - select BR2_PACKAGE_JSONCPP > > - select BR2_PACKAGE_LIBB64 > > - select BR2_PACKAGE_LIBCURL > > + depends on BR2_INSTALL_LIBSTDCPP # yaml-cpp > > + select BR2_PACKAGE_FALCOSECURITY_LIBS > > = > > select BR2_PACKAGE_NCURSES > > = > > - select BR2_PACKAGE_OPENSSL > > - select BR2_PACKAGE_PROTOBUF > > - select BR2_PACKAGE_TBB > > - select BR2_PACKAGE_ZLIB > > + select BR2_PACKAGE_JSON_FOR_MODERN_CPP > > + select BR2_PACKAGE_YAML_CPP > > = > > help > > = > > Sysdig is open source, system-level exploration: > > capture system state and activity from a running Linux > > = > > @@ -30,10 +15,6 @@ config BR2_PACKAGE_SYSDIG > > = > > https://github.com/draios/sysdig/wiki > > = > > -comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >=3D 4.8, > > dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" > > - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > > +comment "sysdig needs a toolchain w/ C++, a Linux kernel and luajit or > > lua 5.1 to be built"> = > > depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ > > = > > - || !BR2_TOOLCHAIN_HAS_THREADS \ > > - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ > > - || !BR2_TOOLCHAIN_USES_GLIBC \ > > - || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 > > + || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 > > diff --git a/package/sysdig/sysdig.hash b/package/sysdig/sysdig.hash > > index 4ec46abfc3..380c9dce1e 100644 > > --- a/package/sysdig/sysdig.hash > > +++ b/package/sysdig/sysdig.hash > > @@ -1,5 +1,3 @@ > > = > > # sha256 locally computed > > = > > -sha256 b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49b= da = > > sysdig-0.27.1.tar.gz +sha256 = > > 3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e = > > sysdig-0.29.1.tar.gz> = > > sha256 a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2= 702 > > COPYING> = > > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b8806= 43 = > > driver/GPL2.txt -sha256 = > > e3f6a43d097ed68176e9738de925d98b938e1bccf6d6bd1bcd79395eca8f76ed = > > driver/MIT.txt diff --git a/package/sysdig/sysdig.mk > > b/package/sysdig/sysdig.mk > > index 9a9aaa35c3..c6487c2337 100644 > > --- a/package/sysdig/sysdig.mk > > +++ b/package/sysdig/sysdig.mk > > @@ -4,10 +4,10 @@ > > = > > # > > #####################################################################= ### > > ########> = > > -SYSDIG_VERSION =3D 0.27.1 > > +SYSDIG_VERSION =3D 0.29.1 > > = > > SYSDIG_SITE =3D $(call github,draios,sysdig,$(SYSDIG_VERSION)) > > = > > -SYSDIG_LICENSE =3D Apache-2.0 (userspace), MIT or GPL-2.0 (driver) > > -SYSDIG_LICENSE_FILES =3D COPYING driver/MIT.txt driver/GPL2.txt > > +SYSDIG_LICENSE =3D Apache-2.0 > > +SYSDIG_LICENSE_FILE =3D COPYING > > = > > SYSDIG_CPE_ID_VENDOR =3D sysdig > > SYSDIG_CONF_OPTS =3D \ > > = > > -DENABLE_DKMS=3DOFF \ > > = > > @@ -16,39 +16,32 @@ SYSDIG_CONF_OPTS =3D \ > > = > > SYSDIG_SUPPORTS_IN_SOURCE_BUILD =3D NO > > = > > SYSDIG_DEPENDENCIES =3D \ > > = > > - c-ares \ > > - elfutils \ > > - grpc \ > > - jq \ > > - jsoncpp \ > > - libb64 \ > > - libcurl \ > > - luainterpreter \ > > + falcosecurity-libs \ > > = > > ncurses \ > > = > > - openssl \ > > - protobuf \ > > - tbb \ > > - zlib > > + json-for-modern-cpp \ > > + yaml-cpp > > = > > -# sysdig creates the module Makefile from a template, which contains a > > -# single place-holder, KBUILD_FLAGS, wich is only replaced with two > > -# things: > > -# - debug flags, which we don't care about here, > > -# - 'sysdig-feature' flags, which are never set, so always empty > > -# So, just replace the place-holder with the only meaningful value: > > nothing. -define SYSDIG_MODULE_GEN_MAKEFILE > > - $(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile > > - $(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile > > - $(SED) 's/@PROBE_NAME@/sysdig-probe/;' $(@D)/driver/Makefile > > -endef > > -SYSDIG_POST_PATCH_HOOKS +=3D SYSDIG_MODULE_GEN_MAKEFILE > > +# We need to set all these variables to avoid compiling > > falcosecurity-libs > > +# twice. > > +SYSDIG_FALCOSECURITY_LIBS_SOURCE_DIR=3D$(BUILD_DIR)/falcosecurity-libs= -e5c5 > > 3d648f3c4694385bbe488e7d47eaa36c229a > Put spaces around assignments. Doesn't check-package warn about this? > = > Also, use $(FALCOSECURITY_LIBS_SRCDIR) instead of reconstructing it. And > with that, there's actually no need to introduce a variable for it. In > fact, I don't see the point for any of the variables defined below, they > only obfuscate what is going on. > = > > +SYSDIG_FALCOSECURITY_LIBS_DRIVER_CONFIG_DIR=3D$(SYSDIG_FALCOSECURITY_L= IBS_S > > OURCE_DIR)/buildroot-build/driver/src > > +SYSDIG_FALCOSECURITY_LIBS_LIBSCAP_SOURCE_DIR=3D$(SYSDIG_FALCOSECURITY_= LIBS > > _SOURCE_DIR)/userspace/libscap > > +SYSDIG_FALCOSECURITY_LIBS_LIBSINSP_SOURCE_DIR=3D$(SYSDIG_FALCOSECURITY= _LIB > > S_SOURCE_DIR)/userspace/libsinsp > > +SYSDIG_FALCOSECURITY_LIBS_CHISEL_SOURCE_DIR=3D$(SYSDIG_FALCOSECURITY_L= IBS_ > > SOURCE_DIR)/userspace/chisel > > +SYSDIG_FALCOSECURITY_LIBS_LIBSCAP_STATIC_LIB_PATH=3D$(SYSDIG_FALCOSECU= RITY > > _LIBS_SOURCE_DIR)/buildroot-build/libscap/libscap.a > > +SYSDIG_FALCOSECURITY_LIBS_LIBSINSP_STATIC_LIB_PATH=3D$(SYSDIG_FALCOSEC= URIT > > Y_LIBS_SOURCE_DIR)/buildroot-build/libsinsp/libsinsp.a > > = > > -# Don't build the driver as part of the 'standard' procedure, we'll > > -# build it on our own with the kernel-module infra. > > -SYSDIG_CONF_OPTS +=3D -DBUILD_DRIVER=3DOFF > > +# SCAP_STATIC_LIBRARY_PATH and SINSP_STATIC_LIBRARY_PATH were added by > > patch. +SYSDIG_CONF_OPTS +=3D > > -DFALCOSECURITY_LIBS_SOURCE_DIR=3D$(SYSDIG_FALCOSECURITY_LIBS_SOURCE_DI= R) \ > Small nit: if you have a multiline assignment, split it like this: > = > SYSDIG_CONF_OPTS +=3D \ > -D... > = > Also, there's already a SYSDIG_CONF_OPTS assignment above, and both are > unconditional. Merge them. Yes, I know this was already wrong before. > = > > + -DHAVE_LIBSCAP=3DOn \ > = > We use ON and OFF for CMake. Doesn't make a difference, but it's nice if > things are consistent. > = > Regards, > Arnout > = > > + -DLIBSCAP_INCLUDE_DIRS=3D"$ (SYSDIG_FALCOSECURITY_LIBS_LIBSCAP_SOURCE_DIR); > > $(SYSDIG_FALCOSECURITY_LIBS_DRIVER_CONFIG_DIR)" \ + -DHAVE_LIBSINSP=3DO= n \ > > + -DLIBSINSP_INCLUDE_DIRS=3D"$ (SYSDIG_FALCOSECURITY_LIBS_LIBSINSP_SOURCE_DIR > > );$(SYSDIG_FALCOSECURITY_LIBS_CHISEL_SOURCE_DIR)" \ > > + -DVALIJSON_INCLUDE=3D$(BUILD_DIR)/valijson-0.6/include/valijson \ > > + -DSCAP_STATIC_LIBRARY_PATH=3D$ (SYSDIG_FALCOSECURITY_LIBS_LIBSCAP_STATIC_LI > > B_PATH) \ > > + -DSINSP_STATIC_LIBRARY_PATH=3D$ (SYSDIG_FALCOSECURITY_LIBS_LIBSINSP_STATIC > > _LIB_PATH)> = > > SYSDIG_MODULE_SUBDIRS =3D driver > > SYSDIG_MODULE_MAKE_OPTS =3D KERNELDIR=3D$(LINUX_DIR) > > = > > -$(eval $(kernel-module)) > > = > > $(eval $(cmake-package)) Best regards. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot