cleanup(scap,sinsp): remove all references to userspace/common

Signed-off-by: Grzegorz Nosek <[email protected]>
falcosecurity · Nov 2, 2023 · 129a62c · 129a62c
1 parent dfb2a15
commit 129a62c
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 24 deletions.
diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake
@@ -44,8 +44,6 @@ else()
 	message(STATUS "No strlcat found, will use local definition")
 endif()
 
-include_directories(${PROJECT_BINARY_DIR}/common)
-
 add_definitions(-DPLATFORM_NAME="${CMAKE_SYSTEM_NAME}")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -57,8 +55,7 @@ else()
 endif()
 
 get_filename_component(LIBSCAP_INCLUDE_DIR ${LIBSCAP_DIR}/userspace/libscap ABSOLUTE)
-get_filename_component(LIBSCAP_COMMON_INCLUDE_DIR ${LIBSCAP_DIR}/userspace/common ABSOLUTE)
-set(LIBSCAP_INCLUDE_DIRS ${LIBSCAP_INCLUDE_DIR} ${LIBSCAP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/libscap ${DRIVER_CONFIG_DIR})
+set(LIBSCAP_INCLUDE_DIRS ${LIBSCAP_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/libscap ${DRIVER_CONFIG_DIR})
 
 function(set_scap_target_properties target)
 	set_target_properties(${target} PROPERTIES
@@ -137,12 +134,6 @@ install(DIRECTORY "${LIBSCAP_INCLUDE_DIR}" DESTINATION "${CMAKE_INSTALL_INCLUDED
 install(DIRECTORY "${DRIVER_CONFIG_DIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/driver"
 			COMPONENT "scap"
 			FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY "${LIBSCAP_DIR}/userspace/common" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
-			COMPONENT "scap"
-			FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY "${PROJECT_BINARY_DIR}/common" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
-			COMPONENT "scap"
-			FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY "${LIBSCAP_DIR}/userspace/plugin" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
 		COMPONENT "scap"
 		FILES_MATCHING PATTERN "*.h")

diff --git a/cmake/modules/libsinsp.cmake b/cmake/modules/libsinsp.cmake
@@ -45,7 +45,7 @@ include(valijson)
 include(re2)
 include(tinydir)
 
-set(LIBSINSP_INCLUDE_DIRS ${LIBSINSP_DIR}/userspace/libsinsp ${LIBSINSP_DIR}/userspace/common ${LIBSCAP_INCLUDE_DIRS} ${DRIVER_CONFIG_DIR})
+set(LIBSINSP_INCLUDE_DIRS ${LIBSINSP_DIR}/userspace/libsinsp ${LIBSCAP_INCLUDE_DIRS} ${DRIVER_CONFIG_DIR})
 if(WITH_CHISEL)
 	list(APPEND LIBSINSP_INCLUDE_DIRS ${LIBSINSP_DIR}/userspace/chisel)
 endif()
@@ -102,9 +102,6 @@ install(DIRECTORY "${LIBSINSP_DIR}/userspace/libsinsp" DESTINATION "${CMAKE_INST
 			PATTERN "*doxygen*" EXCLUDE
 			PATTERN "*scripts*" EXCLUDE
 			PATTERN "*test*" EXCLUDE)
-install(DIRECTORY "${LIBSINSP_DIR}/common" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}"
-			COMPONENT "sinsp"
-			FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY "${LIBSINSP_DIR}/userspace/async" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
 			COMPONENT "sinsp"
 			FILES_MATCHING PATTERN "*.h")

diff --git a/test/drivers/CMakeLists.txt b/test/drivers/CMakeLists.txt
@@ -33,7 +33,6 @@ set(DRIVERS_TEST_SOURCES
 
 set(DRIVERS_TEST_INCLUDE
   PRIVATE
-  ../../userspace/common
   "${GTEST_INCLUDE}"
   "${LIBSCAP_DIR}/driver/"
   "${LIBSCAP_INCLUDE_DIRS}"

diff --git a/userspace/libscap/CMakeLists.txt b/userspace/libscap/CMakeLists.txt
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../common")
 include_directories("${PROJECT_BINARY_DIR}/libscap")
 
 include(engine_config)

diff --git a/userspace/libscap/examples/01-open/CMakeLists.txt b/userspace/libscap/examples/01-open/CMakeLists.txt
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_directories("../../../common")
 include_directories("../../")
 
 add_executable(scap-open

diff --git a/userspace/libscap/examples/02-validatebuffer/CMakeLists.txt b/userspace/libscap/examples/02-validatebuffer/CMakeLists.txt
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_directories("../../../common")
 include_directories("../..")
 
 add_executable(scap-validatebuffer

diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
@@ -7,4 +7,4 @@ Description: lib for System CAPture
 Version: @FALCOSECURITY_LIBS_VERSION@
 
 Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
-Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libscap -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/common
+Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libscap
diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 include_directories(./)
-include_directories(../common)
 include_directories(${LIBSCAP_INCLUDE_DIRS})
 include_directories(../async)
 include_directories(./include)

diff --git a/userspace/libsinsp/examples/CMakeLists.txt b/userspace/libsinsp/examples/CMakeLists.txt
@@ -25,8 +25,6 @@ target_link_libraries(sinsp-example
 	sinsp
 )
 
-target_include_directories(sinsp-example PRIVATE "${CMAKE_SOURCE_DIR}/userspace/common")
-
 if (EMSCRIPTEN)
 	target_compile_options(sinsp-example PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
 	target_link_options(sinsp-example PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")

diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
@@ -8,4 +8,4 @@ Version: @FALCOSECURITY_LIBS_VERSION@
 
 Requires: libscap
 Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
-Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/common @SINSP_PKG_CONFIG_INCLUDES@
+Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libsinsp @SINSP_PKG_CONFIG_INCLUDES@
diff --git a/userspace/libsinsp/sinsp_debug/CMakeLists.txt b/userspace/libsinsp/sinsp_debug/CMakeLists.txt
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_directories("../../../common")
 include_directories("../../")
 
 add_executable(sinsp-debug