summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-10-13 19:27:16 +0000
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-10-16 11:54:24 -0400
commit0aec4f1c0fe888cc93ce0bea0c23188bb1173789 (patch)
tree15694867fb47d4217bf99cc00a4e057bab493bd3
parent591367099f7dac055d4c081fe58e47329b392a30 (diff)
downloadmeta-virtualization-0aec4f1c0fe888cc93ce0bea0c23188bb1173789.tar.gz
runc: Merge common metadata into inc file
Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/runc/runc-docker_git.bb4
-rw-r--r--recipes-containers/runc/runc-opencontainers_git.bb4
-rw-r--r--recipes-containers/runc/runc.inc4
3 files changed, 4 insertions, 8 deletions
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index b8754bd3..9db48ee6 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -12,8 +12,4 @@ SRC_URI = "git://github.com/docker/runc.git;nobranch=1;name=runc-docker \
12 file://0001-Disable-building-recvtty.patch \ 12 file://0001-Disable-building-recvtty.patch \
13 " 13 "
14 14
15GO_IMPORT = "import"
16
17RUNC_VERSION = "1.0.0-rc3" 15RUNC_VERSION = "1.0.0-rc3"
18PROVIDES += "virtual/runc"
19RPROVIDES_${PN} = "virtual/runc"
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index 78488e03..a97676b6 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -6,7 +6,3 @@ SRC_URI = " \
6 file://0001-Use-correct-go-cross-compiler.patch \ 6 file://0001-Use-correct-go-cross-compiler.patch \
7 " 7 "
8RUNC_VERSION = "1.0.0-rc4" 8RUNC_VERSION = "1.0.0-rc4"
9PROVIDES += "virtual/runc"
10RPROVIDES_${PN} = "virtual/runc"
11
12GO_IMPORT = "import"
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc
index c1ff08f7..d2aec843 100644
--- a/recipes-containers/runc/runc.inc
+++ b/recipes-containers/runc/runc.inc
@@ -12,6 +12,10 @@ PV = "${RUNC_VERSION}+git${SRCREV}"
12 12
13inherit go 13inherit go
14RRECOMMENDS_${PN} = "lxc docker" 14RRECOMMENDS_${PN} = "lxc docker"
15PROVIDES += "virtual/runc"
16RPROVIDES_${PN} = "virtual/runc"
17
18GO_IMPORT = "import"
15 19
16LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" 20LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer"
17 21