summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-02-06 11:56:25 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-02-06 11:56:25 -0500
commite2bba8633e7597eff578131891115875298aab40 (patch)
tree43937f622a254b8dd3be3bfdd2af69a57fa46cdc
parentda32b79488aaadaf8780a274129f397670960614 (diff)
downloadmeta-virtualization-e2bba8633e7597eff578131891115875298aab40.tar.gz
runc/config: add seccomp distro feature
When using podman (or other seccomp enabled container runtimes), you will get an OCI container startup error if runc hasn't been built with seccomp. Adding a distro feature to runc and to the README to make it easier to coordinate the support. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--README1
-rw-r--r--recipes-containers/runc/runc.inc6
2 files changed, 6 insertions, 1 deletions
diff --git a/README b/README
index 88068f30..f0809ae3 100644
--- a/README
+++ b/README
@@ -34,6 +34,7 @@ that may also be enabled:
34 - selinux: enables functionality in libvirt and lxc 34 - selinux: enables functionality in libvirt and lxc
35 - systemd: enable systemd services and unit files (for recipes for support) 35 - systemd: enable systemd services and unit files (for recipes for support)
36 - sysvinit: enable sysvinit scripts (for recipes with support) 36 - sysvinit: enable sysvinit scripts (for recipes with support)
37 - seccomp: enable seccomp support for packages that have the capability.
37 38
38Dependencies 39Dependencies
39------------ 40------------
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc
index 41ea41be..5a6aeaf6 100644
--- a/recipes-containers/runc/runc.inc
+++ b/recipes-containers/runc/runc.inc
@@ -14,11 +14,15 @@ inherit go
14inherit goarch 14inherit goarch
15inherit pkgconfig 15inherit pkgconfig
16 16
17PACKAGECONFIG ??= "static"
18PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" 17PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
19# This PACKAGECONFIG serves the purpose of whether building runc as static or not 18# This PACKAGECONFIG serves the purpose of whether building runc as static or not
20PACKAGECONFIG[static] = "" 19PACKAGECONFIG[static] = ""
21 20
21PACKAGECONFIG ??= "static \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
23 "
24
25
22PROVIDES += "virtual/runc" 26PROVIDES += "virtual/runc"
23RPROVIDES_${PN} = "virtual/runc" 27RPROVIDES_${PN} = "virtual/runc"
24 28