wanderer/ fastnetmon-rewritten
1
0
Fork 0
mirror of https://github.com/pavel-odintsov/fastnetmon synced 2024-06-08 20:56:07 +02:00
Code Issues Releases Activity

Added missing sudo for mkdir and improved capnp command search logic

This commit is contained in:
Pavel Odintsov 2022-04-30 16:18:01 +01:00
parent 42e031dc0e
commit d9c8f790bd
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -11,7 +11,7 @@ jobs:
steps:
- run:
name: Create folder to share data between host and Docker container with relaxed permissions to allow use of save / restore cache logic
command: mkdir /data; chmod 770 /data
command: sudo kdir /data; sudo chmod 770 /data
- run:
name: Docker with priviledged mode to run chroot inside and we use tail -f to keep container running
command: sudo docker run -d -v /sys/fs/cgroup/:/sys/fs/cgroup:ro -v /data:/data:rw --privileged --cap-add SYS_ADMIN --name linux_priviledged_container debian:bullseye tail -f /dev/null

11
src/CMakeLists.txt
View File

@ -165,11 +165,20 @@ if (ENABLE_NETMAP_SUPPORT)
add_definitions(-DNETMAP_PLUGIN)
endif()
find_program(CAPNP_BINARY capnp PATHS "${CAPNP_CUSTOM_INSTALL_PATH}/bin" NO_DEFAULT_PATH)
if (CAPNP_BINARY)
message(STATUS "Found capnp compiler: ${CAPNP_BINARY}")
else()
message(FATAL_ERROR "Can't find capnp compiler")
endif()
# Generate capnp bindings
ADD_CUSTOM_COMMAND(
OUTPUT ${PROJECT_SOURCE_DIR}/simple_packet_capnp/simple_packet.capnp.c++
DEPENDS ${PROJECT_SOURCE_DIR}/simple_packet_capnp/simple_packet.capnp
COMMAND "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}" "PATH=$PATH:/opt/${CAPNP_CUSTOM_INSTALL_PATH}/bin" ${CAPNP_CUSTOM_INSTALL_PATH}/bin/capnp compile --output c++:${PROJECT_SOURCE_DIR}/simple_packet_capnp --src-prefix=${PROJECT_SOURCE_DIR}/simple_packet_capnp ${PROJECT_SOURCE_DIR}/simple_packet_capnp/simple_packet.capnp
COMMAND "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}" "PATH=$PATH:/opt/${CAPNP_CUSTOM_INSTALL_PATH}/bin" ${CAPNP_BINARY} compile --output c++:${PROJECT_SOURCE_DIR}/simple_packet_capnp --src-prefix=${PROJECT_SOURCE_DIR}/simple_packet_capnp ${PROJECT_SOURCE_DIR}/simple_packet_capnp/simple_packet.capnp
COMMENT "Build Cap'n'Proto binding for C++"
)