From b41f76b5a070661aba9e558524ab22f23e387d74 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 15 Jul 2020 01:13:58 +0100 Subject: [PATCH] procd: fix compile if procd-ujail is not selected Generating syscall-names.h was added as a dependency for ujail in order to support seccomp for OCI containers. This, however, slipped into the wrong place and broke cmake in case of procd-seccomp being selected but procd-ujail not being selected. Move dependency to the right place to fix that. Fixes: bb4a446 ("uxc: add container management CLI tool") Reported-by: Paul Blazejowski Signed-off-by: Daniel Golle --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b149a06..1f77662 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,9 @@ INSTALL(TARGETS ujail RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_DEPENDENCIES(ujail capabilities-names-h) +IF(SECCOMP_SUPPORT) + ADD_DEPENDENCIES(ujail syscall-names-h) +ENDIF() ADD_EXECUTABLE(ujail-console jail/console.c) TARGET_LINK_LIBRARIES(ujail-console ${ubox} ${ubus} ${blobmsg_json}) @@ -127,9 +130,6 @@ INSTALL(TARGETS uxc RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) endif() -IF(SECCOMP_SUPPORT) - ADD_DEPENDENCIES(ujail syscall-names-h) -ENDIF() IF(UTRACE_SUPPORT) ADD_EXECUTABLE(utrace trace/trace.c) -- 2.30.2