wip

Signed-off-by: Roberto Scolaro <[email protected]>
draios · Apr 14, 2024 · ae401b9 · ae401b9
1 parent dc7fe99
commit ae401b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake
@@ -31,8 +31,8 @@ else()
   # In case you want to test against another driver version (or branch, or commit) just pass the variable -
   # ie., `cmake -DDRIVER_VERSION=dev ..`
   if(NOT DRIVER_VERSION)
-    set(DRIVER_VERSION "7.0.0+driver")
-    set(DRIVER_CHECKSUM "SHA256=9f2a0f14827c0d9d1c3d1abe45b8f074dea531ebeca9859363a92f0d2475757e")
+    set(DRIVER_VERSION "fd8c5341ed7489649e5f536b53317eb4e16479c6")
+    set(DRIVER_CHECKSUM "SHA256=0e51fcdf3a9499f0492a4286a6f80b958c93f9588b08bdecd94fdc0202339d45")
   endif()
 
   # cd /path/to/build && cmake /path/to/source

diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake
@@ -32,8 +32,8 @@ else()
   # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
   # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
   if(NOT FALCOSECURITY_LIBS_VERSION)
-    set(FALCOSECURITY_LIBS_VERSION "0.15.1")
-    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=8c2596fec3c25e9718a8b357b0504450cd26efbe653b79afcd66a8405f0dc08c")
+    set(FALCOSECURITY_LIBS_VERSION "fd8c5341ed7489649e5f536b53317eb4e16479c6")
+    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=0e51fcdf3a9499f0492a4286a6f80b958c93f9588b08bdecd94fdc0202339d45")
   endif()
 
   # cd /path/to/build && cmake /path/to/source
@@ -71,6 +71,7 @@ set(BUILD_LIBSCAP_MODERN_BPF ${BUILD_SYSDIG_MODERN_BPF} CACHE BOOL "")
 set(CREATE_TEST_TARGETS OFF CACHE BOOL "")
 set(BUILD_LIBSCAP_EXAMPLES OFF CACHE BOOL "")
 
+set(WITH_CHISEL ON CACHE INTERNAL "" FORCE)
 set(CHISEL_TOOL_LIBRARY_NAME "sysdig")
 
 set(USE_BUNDLED_TBB ON CACHE BOOL "")

diff --git a/cmake/modules/luajit.cmake b/cmake/modules/luajit.cmake
@@ -34,7 +34,7 @@ else()
 	if(NOT WIN32)
 		set(LUAJIT_LIB "${LUAJIT_SRC}/libluajit.a")
 	else()
-		set(LUAJIT_LIB "${LUAJIT_SRC}/lua52.lib")
+		set(LUAJIT_LIB "${LUAJIT_SRC}/lua51.lib")
 	endif()
 
 	if(NOT TARGET luajit)

diff --git a/userspace/chisel/chisel_api.cpp b/userspace/chisel/chisel_api.cpp
@@ -1559,10 +1559,10 @@ int lua_cbacks::push_metric(lua_State *ls)
 		throw sinsp_exception("chisel error");
 	}
 
-	if (inspector->m_external_event_processor)
-	{
-		inspector->m_external_event_processor->add_chisel_metric(&metric);
-	}
+	//if (inspector->m_external_event_processor)
+	//{
+	//	inspector->m_external_event_processor->add_chisel_metric(&metric);
+	//}
 
 	return 0;
 }

diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt
@@ -18,11 +18,14 @@
 
 if(NOT WIN32)
 	include(ncurses)
-	include(luajit)
 endif() # NOT WIN32
 
 include(zlib)
 
+if(WITH_CHISEL)
+	include(luajit)
+endif()
+
 include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui")
 include_directories(../sinspui)
 include_directories("${PROJECT_BINARY_DIR}/userspace/sysdig")