Skip to content

Commit

Permalink
Integrate FreeBSD Jail support into Kyua build process
Browse files Browse the repository at this point in the history
  • Loading branch information
ihoro committed Feb 3, 2024
1 parent 70e41f0 commit 99692a8
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 0 deletions.
2 changes: 2 additions & 0 deletions engine/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,5 @@ engine_scheduler_test_SOURCES = engine/scheduler_test.cpp
engine_scheduler_test_CXXFLAGS = $(ENGINE_CFLAGS) $(ATF_CXX_CFLAGS)
engine_scheduler_test_LDADD = $(ENGINE_LIBS) $(ATF_CXX_LIBS)
endif

include engine/execenv/Makefile.am.inc
32 changes: 32 additions & 0 deletions engine/execenv/Makefile.am.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Copyright 2024 The Kyua Authors.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Google Inc. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

libengine_a_SOURCES += engine/execenv/execenv.hpp
libengine_a_SOURCES += engine/execenv/execenv.cpp
libengine_a_SOURCES += engine/execenv/jail.hpp
libengine_a_SOURCES += engine/execenv/jail.cpp
4 changes: 4 additions & 0 deletions utils/process/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

UTILS_LIBS += -ljail

libutils_a_SOURCES += utils/process/child.cpp
libutils_a_SOURCES += utils/process/child.hpp
libutils_a_SOURCES += utils/process/child.ipp
Expand All @@ -44,6 +46,8 @@ libutils_a_SOURCES += utils/process/fdstream.hpp
libutils_a_SOURCES += utils/process/fdstream_fwd.hpp
libutils_a_SOURCES += utils/process/isolation.cpp
libutils_a_SOURCES += utils/process/isolation.hpp
libutils_a_SOURCES += utils/process/jail.hpp
libutils_a_SOURCES += utils/process/jail.cpp
libutils_a_SOURCES += utils/process/operations.cpp
libutils_a_SOURCES += utils/process/operations.hpp
libutils_a_SOURCES += utils/process/operations_fwd.hpp
Expand Down

0 comments on commit 99692a8

Please sign in to comment.