Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-12-21 11:25:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Thu Dec 21 11:25:26 2017 rev:21 rq:558283 version:0.2.9+gitr706_06b9cb351610 Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2017-11-30 12:41:08.939173007 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-12-21 11:25:30.794755227 +0100 @@ -1,0 +2,6 @@ +Mon Dec 11 12:30:31 UTC 2017 - asa...@suse.com + +- Update to containerd@06b9cb35161009dcb7123345749fef02f7cea8e0, which is + requried by Docker 17.09.1_ce. + +------------------------------------------------------------------- Old: ---- containerd-git.3addd8406531.tar.xz New: ---- containerd-git.06b9cb351610.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.Os92hk/_old 2017-12-21 11:25:31.654713295 +0100 +++ /var/tmp/diff_new_pack.Os92hk/_new 2017-12-21 11:25:31.654713295 +0100 @@ -26,17 +26,22 @@ %define GO_BUILD_FLAGS -buildmode=pie # MANUAL: Update the git_version and git_revision -%define git_version 3addd840653146c90a254301d6c3a663c7fd6429 -%define git_short 3addd8406531 +%define git_version 06b9cb35161009dcb7123345749fef02f7cea8e0 +%define git_short 06b9cb351610 # How to get the git_revision # git clone https://github.com/containerd/containerd.git containerd-upstream # cd containerd # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r671 +%define git_revision r706 + +# These are the git commits required. We verify them against the source to make +# sure we didn't miss anything important when doing upgrades. This MUST match +# required_dockerrunc in docker.spec! +%define required_dockerrunc 3f2f8b84a77f73d38244dd690525642a72156c64 Name: containerd -Version: 0.2.8+git%{git_revision}_%{git_short} +Version: 0.2.9+git%{git_revision}_%{git_short} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -51,12 +56,11 @@ BuildRequires: fdupes BuildRequires: golang(API) = 1.8 BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Currently runC is the only supported runtime for containerd. NOTE: -# This version pinning is done to follow (as well as we can) upstream's -# Dockerfile. However, for some reason the Dockerfile for containerd -# diverges from the one for Docker. As such, this cannot be a hard -# requirement (that would break Docker). -Requires: docker-runc = 1.0.0rc3+gitr3201_2d41c04 +# We provide a git revision so that Docker can require it properly. +Provides: %{name}-git = %{git_version} +# Currently runC is the only supported runtime for containerd. We match the +# same version as the one pinned by Docker. +Requires: docker-runc-git = %{required_dockerrunc} Requires(post): %fillup_prereq %description @@ -94,20 +98,24 @@ # Do not use symlinks. If you want to run the unit tests for this package at # some point during the build and you need to directly use go list directly it # will get confused by symlinks. -export GOPATH=${HOME}/go:${HOME}/go/src/github.com/containerd/containerd/vendor -mkdir -p $HOME/go/src/github.com/containerd/containerd -rm -rf $HOME/go/src/github.com/containerd/containerd/* -cp -ar * $HOME/go/src/github.com/containerd/containerd - -make GIT_COMMIT=%{git_version} -cp bin/ctr ctr-%{version} -cp bin/containerd containerd-%{version} -cp bin/containerd-shim containerd-shim-%{version} +export GOPATH=$HOME/go +export PROJECT=$HOME/go/src/github.com/containerd/containerd +mkdir -p $PROJECT +rm -rf $PROJECT/* +cp -ar * $PROJECT + +make -C $PROJECT GIT_COMMIT=%{git_version} +cp $PROJECT/bin/ctr ctr-%{version} +cp $PROJECT/bin/containerd containerd-%{version} +cp $PROJECT/bin/containerd-shim containerd-shim-%{version} %check export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH cd $HOME/go/src/github.com/containerd/containerd -%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep github.com/containerd/containerd | grep -v /integration-test) +%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \ + grep github.com/containerd/containerd | \ + grep -v github.com/containerd/containerd/vendor | \ + grep -v /integration-test) %install install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Os92hk/_old 2017-12-21 11:25:31.682711930 +0100 +++ /var/tmp/diff_new_pack.Os92hk/_new 2017-12-21 11:25:31.682711930 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="filename">containerd</param> <param name="versionformat">git.%h</param> - <param name="revision">3addd840653146c90a254301d6c3a663c7fd6429</param> + <param name="revision">06b9cb35161009dcb7123345749fef02f7cea8e0</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ containerd-git.3addd8406531.tar.xz -> containerd-git.06b9cb351610.tar.xz ++++++ ++++ 385153 lines of diff (skipped)
