Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2016-09-21 18:49:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2016-08-20 12:27:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2016-09-21 18:49:25.000000000 +0200 @@ -1,0 +2,43 @@ +Mon Sep 19 11:58:44 UTC 2016 - jmassaguer...@suse.com + +- fix go_arches definition: use global instead of define, otherwise + it fails to build + +------------------------------------------------------------------- +Thu Aug 25 15:54:38 UTC 2016 - jmassaguer...@suse.com + +- Remove GOPATH at the end of the GOPATH assignment + cause GOPATH is empty and if we do that, we get the path "" + appended, which causes gcc6-go to complain + +------------------------------------------------------------------- +Wed Aug 24 12:25:46 UTC 2016 - jmassaguer...@suse.com + +- add go_arches in project configuration: this way, we can use the + same spec file but decide in the project configuration if to + use gc-go or gcc-go for some archs. + +------------------------------------------------------------------- +Mon Aug 22 18:14:40 UTC 2016 - jmassaguer...@suse.com + +- update to v2.3.0 (bsc#995058) +- Remove patches which were already merged upstream: + * socket-activation-01-vendor.patch + * socket-activation-02-daemon.patch + * socket-activation-03-ctr.patch + +------------------------------------------------------------------- +Thu Aug 18 10:34:29 UTC 2016 - jmassaguer...@suse.com + +- use gcc6-go instead of gcc5-go (bsc#988408) +- build ppc64le with gc-go because this version builds with gc-go 1.6 + +------------------------------------------------------------------- +Thu Aug 18 10:33:29 UTC 2016 - cbrau...@suse.com + +- bump git commit id to the one required by docker v1.12.0 +- run test during build +- only run tests on architectures that provide the go list and got test tools +- add aarch64 to go arches + +------------------------------------------------------------------- @@ -88,0 +132,12 @@ +Thu Mar 31 03:42:39 UTC 2016 - asa...@suse.de + +* Update to containerd 0.1.0. This required quite a few fixes. +* Use socket activation with the containerd daemon. This requires a + not-yet-upstream patchset (https://github.com/docker/containerd/pull/178): + + socket-activation-01-vendor.patch + + socket-activation-02-daemon.patch + + socket-activation-03-ctr.patch +* Remove MountFlags=slave since it's not relevant to containerd and might cause + issues in the future. + +------------------------------------------------------------------- @@ -95,0 +151,6 @@ +------------------------------------------------------------------- +Sun Mar 27 10:19:02 UTC 2016 - asa...@suse.de + +* Add initial packaging of containerd 0.0.5. +* Install to /usr/sbin. +* Separately package the client from the server. Old: ---- containerd-0.2.2.tar.xz socket-activation-01-vendor.patch socket-activation-02-daemon.patch socket-activation-03-ctr.patch New: ---- containerd-0.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.KTw9p0/_old 2016-09-21 18:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KTw9p0/_new 2016-09-21 18:49:27.000000000 +0200 @@ -16,20 +16,33 @@ # -%define go_arches %ix86 x86_64 aarch64 +# Check if go_arches is defined in the project configuration +# Otherwise, define it here +# In order to define it in the project configuration, see +# +# https://en.opensuse.org/openSUSE:Build%20Service%20prjconf#Macros +# +# The Macros tag is the one that defines the go_arches variable to be used +# in the spec file. +# The "define" one is to help the specfile parser of the buildservice +# to see what packages are being built. You also want to define it here +# for keeping things consistent. + +%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le} %ifarch %go_arches %define go_tool go %define GO_BUILD_FLAGS %{nil} %else -%define go_tool go-5 +%define go_tool go-6 %define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl" %endif -%define version_unconverted 0.2.2 +%define git_version 973f21f +%define version_unconverted 0.2.3 Name: containerd -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -39,15 +52,10 @@ Source1: %{name}.service Source2: %{name}.socket Source3: sysconfig.%{name} -# Patches to implement systemd socket activation. -# https://github.com/docker/containerd/pull/178 -Patch101: socket-activation-01-vendor.patch -Patch102: socket-activation-02-daemon.patch -Patch103: socket-activation-03-ctr.patch %ifarch %go_arches BuildRequires: go >= 1.5 %else -BuildRequires: gcc5-go >= 5.0 +BuildRequires: gcc6-go >= 6.1 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # Currently runC is the only supported runtime for containerd. NOTE: @@ -55,7 +63,7 @@ # 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: runc >= 0.1.0 +Requires: runc = 0.1.1+gitcc29e3d %define client ctr %define daemon %{name} @@ -75,7 +83,7 @@ %ifarch %go_arches BuildRequires: go >= 1.5 %else -BuildRequires: gcc5-go >= 5.0 +BuildRequires: gcc6-go >= 6.1 %endif %description ctr @@ -97,21 +105,17 @@ %prep %setup -q -# Systemd socket activation patches. -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 %build # 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/docker/containerd/vendor:${GOPATH} +export GOPATH=${HOME}/go:${HOME}/go/src/github.com/docker/containerd/vendor mkdir -pv $HOME/go/src/github.com/docker/containerd rm -rf $HOME/go/src/github.com/docker/containerd/* cp -avr * $HOME/go/src/github.com/docker/containerd -# Build deamon. +# Build daemon. %go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version} github.com/docker/%{name}/%{daemon} # Build shim. @@ -120,6 +124,13 @@ # Build client. %go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version} github.com/docker/%{name}/%{client} +%ifarch %go_arches +%check +export GOPATH=$HOME/go/src/github.com/docker/containerd/vendor:$GOPATH +cd $HOME/go/src/github.com/docker/containerd +go test -v $(go list ./... | grep github.com/docker/containerd | grep -v /integration-test) +%endif + %install %{__install} -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon} %{__install} -D -m755 %{shim}-%{version} %{buildroot}/%{_sbindir}/%{shim} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KTw9p0/_old 2016-09-21 18:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KTw9p0/_new 2016-09-21 18:49:27.000000000 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/docker/containerd.git</param> <param name="scm">git</param> <param name="filename">containerd</param> - <param name="versionformat">0.2.2</param> - <param name="revision">v0.2.2</param> + <param name="versionformat">0.2.3</param> + <param name="revision">v0.2.3</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ containerd-0.2.2.tar.xz -> containerd-0.2.3.tar.xz ++++++ ++++ 158029 lines of diff (skipped) ++++++ containerd.service ++++++ --- /var/tmp/diff_new_pack.KTw9p0/_old 2016-09-21 18:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KTw9p0/_new 2016-09-21 18:49:27.000000000 +0200 @@ -6,7 +6,7 @@ [Service] EnvironmentFile=/etc/sysconfig/containerd -ExecStart=/usr/sbin/containerd --listen fd:// --runtime /usr/sbin/runc $CONTAINERD_OPTS +ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity ++++++ containerd.socket ++++++ --- /var/tmp/diff_new_pack.KTw9p0/_old 2016-09-21 18:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KTw9p0/_new 2016-09-21 18:49:27.000000000 +0200 @@ -4,7 +4,7 @@ [Socket] ListenStream=/run/containerd/containerd.sock -SocketMode=0600 +SocketMode=0660 SocketUser=root SocketGroup=root
