summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-03-12 15:35:14 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-03-15 23:15:42 -0400
commitd50cb4be3c058c04c5d150c257c9470f1ae9804b (patch)
treeaf1b80023378575c6a99bfc72334af0aaf000f83
parent0a35ee512c98c3d242543e5b8b71acb38be003f6 (diff)
downloadmeta-virtualization-d50cb4be3c058c04c5d150c257c9470f1ae9804b.tar.gz
runc: add selinux and seccomp package configs
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/runc/runc.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc
index 5a6aeaf6..eb8aa022 100644
--- a/recipes-containers/runc/runc.inc
+++ b/recipes-containers/runc/runc.inc
@@ -15,11 +15,13 @@ inherit goarch
15inherit pkgconfig 15inherit pkgconfig
16 16
17PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" 17PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
18PACKAGECONFIG[selinux] = "selinux,,libselinux"
18# This PACKAGECONFIG serves the purpose of whether building runc as static or not 19# This PACKAGECONFIG serves the purpose of whether building runc as static or not
19PACKAGECONFIG[static] = "" 20PACKAGECONFIG[static] = ""
20 21
21PACKAGECONFIG ??= "static \ 22PACKAGECONFIG ??= "static \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
23 " 25 "
24 26
25 27
@@ -31,7 +33,12 @@ GO_IMPORT = "import"
31LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" 33LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer"
32 34
33do_configure[noexec] = "1" 35do_configure[noexec] = "1"
34EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS}' GO=${GO}" 36
37
38DISTRO_BUILDTAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
40
41EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}"
35 42
36do_compile() { 43do_compile() {
37 # Set GOPATH. See 'PACKAGERS.md'. Don't rely on 44 # Set GOPATH. See 'PACKAGERS.md'. Don't rely on