diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-03-12 15:35:14 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-03-15 23:15:42 -0400 |
commit | d50cb4be3c058c04c5d150c257c9470f1ae9804b (patch) | |
tree | af1b80023378575c6a99bfc72334af0aaf000f83 | |
parent | 0a35ee512c98c3d242543e5b8b71acb38be003f6 (diff) | |
download | meta-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.inc | 9 |
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 | |||
15 | inherit pkgconfig | 15 | inherit pkgconfig |
16 | 16 | ||
17 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" | 17 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" |
18 | PACKAGECONFIG[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 |
19 | PACKAGECONFIG[static] = "" | 20 | PACKAGECONFIG[static] = "" |
20 | 21 | ||
21 | PACKAGECONFIG ??= "static \ | 22 | PACKAGECONFIG ??= "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" | |||
31 | LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" | 33 | LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" |
32 | 34 | ||
33 | do_configure[noexec] = "1" | 35 | do_configure[noexec] = "1" |
34 | EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS}' GO=${GO}" | 36 | |
37 | |||
38 | DISTRO_BUILDTAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ | ||
39 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | ||
40 | |||
41 | EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}" | ||
35 | 42 | ||
36 | do_compile() { | 43 | do_compile() { |
37 | # Set GOPATH. See 'PACKAGERS.md'. Don't rely on | 44 | # Set GOPATH. See 'PACKAGERS.md'. Don't rely on |