[meta-virtualization] [PATCH 2/2] runc: uprev to version required by docker 1.13.0

[Mark Asselstine]

On Fri, Feb 10, 2017 at 10:48 AM, Bruce Ashfield
<bruce.ashfield at windriver.com> wrote:
> On 2017-02-10 10:44 AM, Mark Asselstine wrote:
>>
>> At the moment we only use runc in conjunction with docker. In order to
>> allow docker to function correctly we need to use the version
>> specified in docker's vendor.conf file. Uprev runc to this version.
>>
>> NOTE that the docker folks have actually forked runc and I have used
>> this fork as the SRC_URI. I could have chosen instead to use the old
>> SRC_URI along with the fork point commit as the SRCREV, and then
>> applied the 2 commits the docker team have added beyond the fork. I
>> opted instead to use the fork such that 'docker info' would not
>> complain about a version mismatch. This also makes it easier to google
>> for issues since the commit ID matches.
>>
>> NOTE when we eventually have more users of runc we will have to
>> determine a strategy to either have them all use the same version or
>> allow for multiple versions of runc on the system. This is also true
>> for containerd.
>
>
> We already have more users of runc, so I unfortunately can't take
> this uprev at the moment.
>
> There doesn't have to be multiple versions on the target,

OK, as long as we are not expecting multiple version on the target at
the same time the split is a good approach and I can make this happen.
I will send a V2 with these changes.

Mark


> but we
> need to split the package into "docker-runc" and "runc", which is
> what other distros tend to do.
>
> So I can't take this update at the moment, and we'll have to work
> on the package split before we can do the update. We need all the
> components to be individually updated without docker dictating the
> revisions.
>
> Bruce
>
>>
>> Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
>> ---
>>  recipes-containers/runc/runc_git.bb | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-containers/runc/runc_git.bb
>> b/recipes-containers/runc/runc_git.bb
>> index 23c0094..c5cf40b 100644
>> --- a/recipes-containers/runc/runc_git.bb
>> +++ b/recipes-containers/runc/runc_git.bb
>> @@ -4,9 +4,9 @@ DESCRIPTION = "runc is a CLI tool for spawning and running
>> containers according
>>
>>  # Note: this rev is before the required protocol field, update when all
>> components
>>  #       have been updated to match.
>> -SRCREV = "1cdaa709f151b61cee2bdaa09d8e5d2b58a8ba72"
>> +SRCREV = "2f7393a47307a16f8cee44a37b262e8b81021e3e"
>>  SRC_URI = "\
>> -       git://github.com/opencontainers/runc;branch=master \
>> +       git://github.com/docker/runc.git;nobranch=1 \
>>         "
>>
>>  # Apache-2.0 for containerd
>> @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM =
>> "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
>>
>>  S = "${WORKDIR}/git"
>>
>> -RUNC_VERSION = "1.0.0-rc1"
>> +RUNC_VERSION = "1.0.0-rc2"
>>  PV = "${RUNC_VERSION}+git${SRCREV}"
>>
>>  DEPENDS = "go-cross-${TARGET_ARCH} \
>>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization