From bc055cf691454080dc88ff64d8a69c820f2ac69ed889f66095c9d4614828ea01 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 26 Jun 2020 11:38:45 +0000 Subject: [PATCH] Accepting request 817196 from home:cyphar:docker - Update to Docker 19.03.12-ce. See upstream changelog in the packaged /usr/share/doc/packages/docker/CHANGELOG.md. - Use Go 1.13 instead of Go 1.14 because Go 1.14 can cause all sorts of spurrious errors due to Go returning -EINTR from I/O syscalls much more often (due to Go 1.14's pre-emptive goroutine support). - bsc1172377-0001-unexport-testcase.Cleanup-to-fix-Go-1.14.patch - Add BuildRequires for all -git dependencies so that we catch missing dependencies much more quickly. OBS-URL: https://build.opensuse.org/request/show/817196 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=105 --- containerd.changes | 5 +++++ containerd.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/containerd.changes b/containerd.changes index 92387eb..0dd4897 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 25 22:32:08 UTC 2020 - Aleksa Sarai + +- Use Go 1.13 for build. + ------------------------------------------------------------------- Tue Jun 2 08:57:36 UTC 2020 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index dccf3d1..fa0ea0d 100644 --- a/containerd.spec +++ b/containerd.spec @@ -54,7 +54,9 @@ BuildRequires: go-go-md2man BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libseccomp-devel >= 2.2 BuildRequires: pkg-config -BuildRequires: golang(API) >= 1.11 +# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires +# for 'golang(API) >= 1.13' here, so just require 1.13 exactly. bsc#1172608 +BuildRequires: go1.13 # 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 pin the same