diff options
| author | Paul Barker <paul@betafive.co.uk> | 2019-01-11 17:29:37 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2019-01-16 10:28:25 -0500 |
| commit | 8bd3ee327db71544bb29673f72a89064ab0df6f4 (patch) | |
| tree | f5f43b63ae0297a141ed7d5673940f6f4d238b5a | |
| parent | ea4ea5fbc3f305fd3ce757573cbdacd23438f31d (diff) | |
| download | meta-virtualization-8bd3ee327db71544bb29673f72a89064ab0df6f4.tar.gz | |
runc.inc: Move RRECOMMENDS to runc-docker
If we're building runc-opencontainers it's likely that we're not using
docker.
Signed-off-by: Paul Barker <paul@betafive.co.uk>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-containers/runc/runc-docker_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/runc/runc.inc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index 02bda318..11fa68aa 100644 --- a/recipes-containers/runc/runc-docker_git.bb +++ b/recipes-containers/runc/runc-docker_git.bb | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | include runc.inc | 1 | include runc.inc |
| 2 | 2 | ||
| 3 | RRECOMMENDS_${PN} = "lxc docker" | ||
| 4 | |||
| 3 | # Note: this rev is before the required protocol field, update when all components | 5 | # Note: this rev is before the required protocol field, update when all components |
| 4 | # have been updated to match. | 6 | # have been updated to match. |
| 5 | SRCREV_runc-docker = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" | 7 | SRCREV_runc-docker = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" |
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 6d11a6ef..5a2ca31a 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc | |||
| @@ -17,7 +17,6 @@ inherit pkgconfig | |||
| 17 | PACKAGECONFIG ??= "" | 17 | PACKAGECONFIG ??= "" |
| 18 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" | 18 | PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" |
| 19 | 19 | ||
| 20 | RRECOMMENDS_${PN} = "lxc docker" | ||
| 21 | PROVIDES += "virtual/runc" | 20 | PROVIDES += "virtual/runc" |
| 22 | RPROVIDES_${PN} = "virtual/runc" | 21 | RPROVIDES_${PN} = "virtual/runc" |
| 23 | 22 | ||
