From 0aec4f1c0fe888cc93ce0bea0c23188bb1173789 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 13 Oct 2017 19:27:16 +0000 Subject: runc: Merge common metadata into inc file Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- recipes-containers/runc/runc-docker_git.bb | 4 ---- recipes-containers/runc/runc-opencontainers_git.bb | 4 ---- recipes-containers/runc/runc.inc | 4 ++++ 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'recipes-containers') 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 \ file://0001-Disable-building-recvtty.patch \ " -GO_IMPORT = "import" - RUNC_VERSION = "1.0.0-rc3" -PROVIDES += "virtual/runc" -RPROVIDES_${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 = " \ file://0001-Use-correct-go-cross-compiler.patch \ " RUNC_VERSION = "1.0.0-rc4" -PROVIDES += "virtual/runc" -RPROVIDES_${PN} = "virtual/runc" - -GO_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}" inherit go RRECOMMENDS_${PN} = "lxc docker" +PROVIDES += "virtual/runc" +RPROVIDES_${PN} = "virtual/runc" + +GO_IMPORT = "import" LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" -- cgit v1.2.3-54-g00ecf