Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-05-20 10:13:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Sat May 20 10:13:11 2017 rev:15 rq:494717 version:0.2.5+gitr639_422e31c Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2017-04-17 10:26:33.376132371 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-05-20 10:13:24.586032281 +0200 @@ -1,0 +2,34 @@ +Thu May 4 19:02:18 UTC 2017 - [email protected] + +- fix golang requirement to 1.7 for the subpackages + +------------------------------------------------------------------- +Tue May 2 15:48:53 UTC 2017 - [email protected] + +- fix golang requirement to 1.7 + +------------------------------------------------------------------- +Fri Apr 28 16:18:44 UTC 2017 - [email protected] + +- Replace %__-type macro indirections + +------------------------------------------------------------------- +Thu Apr 13 16:17:55 UTC 2017 - [email protected] + +- update containerd to the commit version needed for + docker-v17.04.0-ce (bsc#1034053) + + fix bsc#1032769: containerd spurious messages filling journal + +------------------------------------------------------------------- +Wed Apr 12 09:56:54 UTC 2017 - [email protected] + +- make sure this package is being built with go 1.7 + +------------------------------------------------------------------- +Wed Apr 12 09:13:44 UTC 2017 - [email protected] + +- remove the go_arches macro because we are using go1.7 which + is available in all archs + +------------------------------------------------------------------- Old: ---- containerd-git.03e5862.tar.xz New: ---- containerd-git.422e31c.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.VCOKf3/_old 2017-05-20 10:13:25.749867841 +0200 +++ /var/tmp/diff_new_pack.VCOKf3/_new 2017-05-20 10:13:25.753867276 +0200 @@ -16,36 +16,17 @@ # -# 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-6 -%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl" -%endif # MANUAL: Update the git_version and git_revision -%define git_version 03e5862 +%define git_version 422e31c # How to get the git_revision # git clone https://github.com/docker/containerd.git containerd-upstream # cd containerd # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r608 +%define git_revision r639 %define version_unconverted %{git_version} Name: containerd @@ -59,18 +40,15 @@ Source1: %{name}.service Source2: %{name}.socket Source3: sysconfig.%{name} -%ifarch %go_arches -BuildRequires: go >= 1.5 -%else -BuildRequires: gcc6-go >= 6.1 -%endif +# Make sure we require go 1.7 +BuildRequires: golang(API) = 1.7 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: runc = 0.1.1+gitr2942_2f7393a +Requires: runc = 0.1.1+gitr2947_9c2d8d1 Requires(post): %fillup_prereq %define client ctr @@ -88,11 +66,8 @@ Summary: Client for %{name} Group: System/Management Requires: %{name} = %{version} -%ifarch %go_arches -BuildRequires: go >= 1.5 -%else -BuildRequires: gcc6-go >= 6.1 -%endif +# Make sure we require go 1.7 +BuildRequires: golang(API) = 1.7 %description ctr Standalone client for containerd, which allows management of containerd containers @@ -100,12 +75,9 @@ %package test Summary: Test package for containerd +# Make sure we require go 1.7 Group: System/Management -%ifarch %go_arches -Requires: go >= 1.5 -%else -Requires: gcc5-go >= 5.0 -%endif +BuildRequires: golang(API) = 1.7 BuildArch: noarch %description test @@ -132,23 +104,21 @@ # 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} -%{__install} -D -m755 %{client}-%{version} %{buildroot}/%{_sbindir}/%{name}-%{client} +install -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon} +install -D -m755 %{shim}-%{version} %{buildroot}/%{_sbindir}/%{shim} +install -D -m755 %{client}-%{version} %{buildroot}/%{_sbindir}/%{name}-%{client} # Add service and sysconfig. -%{__install} -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service -%{__install} -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{name}.socket +install -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service +install -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{name}.socket ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd -%{__install} -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +install -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} install -d -m755 %{buildroot}/usr/src/containerd/ cp -avr $HOME/go/src/github.com/docker/containerd/* %{buildroot}/usr/src/containerd/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VCOKf3/_old 2017-05-20 10:13:25.793861625 +0200 +++ /var/tmp/diff_new_pack.VCOKf3/_new 2017-05-20 10:13:25.793861625 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="filename">containerd</param> <param name="versionformat">git.%h</param> - <param name="revision">03e5862ec0d8d3b3f750e19fca3ee367e13c090e</param> + <param name="revision">422e31ce907fd9c3833a38d7b8fdd023e5a76e73</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ containerd-git.03e5862.tar.xz -> containerd-git.422e31c.tar.xz ++++++ ++++ 6173 lines of diff (skipped)
