diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-08-07 09:14:44 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-12 11:03:01 -0400 |
commit | 0ca391c1c20125fbe0385058c1db0be04539275b (patch) | |
tree | b64ef943d12b4f5411dc5301ecaa9e37b69fbe50 /recipes-containers/runc/runc.inc | |
parent | 7de381880415b20aba3a0840207e9983af489421 (diff) | |
download | meta-virtualization-0ca391c1c20125fbe0385058c1db0be04539275b.tar.gz |
runc: add PACKAGECONFIG to allow building as static or not
Add a new PACKAGECONFIG, static, which when enabled will build
runc as static. Default to enable it.
We need this because we should allow users to build runc as not
static so that when docker's cgroup driver is set to systemd,
we don't get error.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/runc/runc.inc')
-rw-r--r-- | recipes-containers/runc/runc.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 46fd09dc..41ea41be 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc | |||
@@ -14,8 +14,10 @@ inherit go | |||
14 | inherit goarch | 14 | inherit goarch |
15 | inherit pkgconfig | 15 | inherit pkgconfig |
16 | 16 | ||
17 | PACKAGECONFIG ??= "" | 17 | PACKAGECONFIG ??= "static" |
18 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" | 18 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" |
19 | # This PACKAGECONFIG serves the purpose of whether building runc as static or not | ||
20 | PACKAGECONFIG[static] = "" | ||
19 | 21 | ||
20 | PROVIDES += "virtual/runc" | 22 | PROVIDES += "virtual/runc" |
21 | RPROVIDES_${PN} = "virtual/runc" | 23 | RPROVIDES_${PN} = "virtual/runc" |
@@ -54,7 +56,11 @@ do_compile() { | |||
54 | export CFLAGS="" | 56 | export CFLAGS="" |
55 | export LDFLAGS="" | 57 | export LDFLAGS="" |
56 | 58 | ||
57 | oe_runmake static | 59 | if ${@bb.utils.contains('PACKAGECONFIG', 'static', 'true', 'false', d)}; then |
60 | oe_runmake static | ||
61 | else | ||
62 | oe_runmake runc | ||
63 | fi | ||
58 | } | 64 | } |
59 | 65 | ||
60 | do_install() { | 66 | do_install() { |