The package rpms/containerd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/containerd.git/commit/?id=4f32297....
Change:
-%ifnarch ppc64
Thanks.
Full change:
============
commit 4f32297adfe64b3d3ec05b47acd8647d650274e0
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Thu Jun 27 19:50:51 2019 +0200
Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/containerd.spec b/containerd.spec
index 86fb0de..5b4d71b 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -1,200 +1,173 @@
-%global goipath
github.com/containerd/containerd
-Version: 1.2.4
-
-%if %{defined fedora}
-%gometa
+# Generated by go2rpm
+# arm support not fully implemented: not implemented
%ifnarch %{arm}
-%bcond_without tests
-%endif
-%else
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
-%global debug_package %{nil}
-%global gourl https://%{goipath}
-%global gosource %{gourl}/archive/v%{version}/%{name}-%{version}.tar.gz
-%define gobuildroot %{expand:
-GO_BUILD_PATH=$PWD/_build
-install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
-ln -fs $PWD $GO_BUILD_PATH/src/%{goipath}
-cd $GO_BUILD_PATH/src/%{goipath}
-install -m 0755 -vd _bin
-export PATH=$PWD/_bin${PATH:+:$PATH}
-export GOPATH=$GO_BUILD_PATH:%{gopath}
-}
-%define gobuild(o:) %{expand:
-%global _dwz_low_mem_die_limit 0
-%ifnarch ppc64
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}"
-ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d '
\\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x
%{?**};
-%else
-go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')
-extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
-%endif
-}
+%bcond_without check
%endif
+%bcond_without bootstrap
+
+#
https://github.com/containerd/containerd
+%global goipath
github.com/containerd/containerd
+Version: 1.2.6
+%global commit d68b593de4ab10bb8b4fd64560e10d43c7156db2
+%gometa
-Name: containerd
+%global goname containerd
+%global godevelname containerd-devel
+
+%global common_description %{expand:
+Containerd is an industry-standard container runtime with an emphasis on
+simplicity, robustness and portability. It is available as a daemon for Linux
+and Windows, which can manage the complete container lifecycle of its host
+system: image transfer and storage, container execution and supervision,
+low-level storage and network attachments, etc.}
+
+%global golicenses LICENSE NOTICE
+%global godocs docs PLUGINS.md ROADMAP.md RUNC.md SCOPE.md code-of-\\\
+ conduct.md BUILDING.md README.md RELEASES.md
+
+Name: %{goname}
Release: 1%{?dist}
-Summary: An industry-standard container runtime
+Summary: Open and reliable container runtime
+
+# Upstream license specification: Apache-2.0
License: ASL 2.0
-URL:
https://containerd.io
+URL: %{gourl}
Source0: %{gosource}
-Source1: containerd.service
-Source2: containerd.toml
-BuildRequires: golang >= 1.10
BuildRequires: btrfs-progs-devel
BuildRequires: go-md2man
-BuildRequires: systemd
-%{?systemd_requires}
-Requires: runc
-
-# vendored libraries
-# grep -v -e '^$' -e '^#' containerd-*/vendor.conf | sort | awk
'{print "Provides: bundled(golang("$1")) = "$2}'
-Provides:
bundled(golang(github.com/beorn7/perks)) =
4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-Provides:
bundled(golang(github.com/blang/semver)) = v3.1.0
-Provides:
bundled(golang(github.com/BurntSushi/toml)) =
a368813c5e648fee92e5f6c30e3944ff9d5e8895
-Provides:
bundled(golang(github.com/containerd/aufs)) =
ffa39970e26ad01d81f540b21e65f9c1841a5f92
-Provides:
bundled(golang(github.com/containerd/btrfs)) =
2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
-Provides:
bundled(golang(github.com/containerd/cgroups)) =
5e610833b72089b37d0e615de9a92dfc043757c2
-Provides:
bundled(golang(github.com/containerd/console)) =
c12b1e7919c14469339a5d38f2f8ed9b64a9de23
-Provides:
bundled(golang(github.com/containerd/continuity)) =
bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
-Provides:
bundled(golang(github.com/containerd/cri)) =
0ca1e3c2b73b5c38e72f29bb76338d0078b23d6c
-Provides:
bundled(golang(github.com/containerd/fifo)) =
3d5202aec260678c48179c56f40e6f38a095738c
-Provides:
bundled(golang(github.com/containerd/go-cni)) =
40bcf8ec8acd7372be1d77031d585d5d8e561c90
-Provides:
bundled(golang(github.com/containerd/go-runc)) =
5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
-Provides:
bundled(golang(github.com/containerd/ttrpc)) =
2a805f71863501300ae1976d29f0454ae003e85a
-Provides:
bundled(golang(github.com/containerd/typeurl)) =
a93fcdb778cd272c6e9b3028b2f42d813e785d40
-Provides:
bundled(golang(github.com/containerd/zfs)) =
9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec
-Provides:
bundled(golang(github.com/containernetworking/cni)) = v0.6.0
-Provides:
bundled(golang(github.com/containernetworking/plugins)) = v0.7.0
-Provides:
bundled(golang(github.com/coreos/go-systemd)) =
48702e0da86bd25e76cfef347e2adeb434a0d0a6
-Provides:
bundled(golang(github.com/davecgh/go-spew)) = v1.1.0
-Provides:
bundled(golang(github.com/docker/distribution)) =
b38e5838b7b2f2ad48e06ec4b500011976080621
-Provides:
bundled(golang(github.com/docker/docker)) =
86f080cff0914e9694068ed78d503701667c4c00
-Provides:
bundled(golang(github.com/docker/go-events)) =
9461782956ad83b30282bf90e31fa6a70c255ba9
-Provides:
bundled(golang(github.com/docker/go-metrics)) =
4ea375f7759c82740c893fc030bc37088d2ec098
-Provides:
bundled(golang(github.com/docker/go-units)) = v0.3.1
-Provides:
bundled(golang(github.com/docker/spdystream)) =
449fdfce4d962303d702fec724ef0ad181c92528
-Provides:
bundled(golang(github.com/emicklei/go-restful)) = v2.2.1
-Provides:
bundled(golang(github.com/ghodss/yaml)) = v1.0.0
-Provides:
bundled(golang(github.com/godbus/dbus)) =
c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
-Provides:
bundled(golang(github.com/gogo/googleapis)) =
08a7655d27152912db7aaf4f983275eaf8d128ef
-Provides:
bundled(golang(github.com/gogo/protobuf)) = v1.0.0
-Provides:
bundled(golang(github.com/golang/glog)) =
44145f04b68cf362d9c4df2182967c2275eaefed
-Provides:
bundled(golang(github.com/golang/protobuf)) = v1.1.0
-Provides:
bundled(golang(github.com/google/go-cmp)) = v0.1.0
-Provides:
bundled(golang(github.com/google/gofuzz)) =
44d81051d367757e1c7c6a5a86423ece9afcf63c
-Provides:
bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) =
6b7015e65d366bf3f19b2b2a000a831940f0f7e0
-Provides:
bundled(golang(github.com/hashicorp/errwrap)) =
7554cd9344cec97297fa6649b055a8c98c2a1e55
-Provides:
bundled(golang(github.com/hashicorp/go-multierror)) =
ed905158d87462226a13fe39ddf685ea65f1c11f
-Provides:
bundled(golang(github.com/json-iterator/go)) = 1.1.5
-Provides:
bundled(golang(github.com/matttproud/golang_protobuf_extensions)) =
v1.0.0
-Provides:
bundled(golang(github.com/Microsoft/go-winio)) = v0.4.11
-Provides:
bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.1
-Provides:
bundled(golang(github.com/mistifyio/go-zfs)) =
166add352731e515512690329794ee593f1aaff2
-Provides:
bundled(golang(github.com/modern-go/concurrent)) = 1.0.3
-Provides:
bundled(golang(github.com/modern-go/reflect2)) = 1.0.1
-Provides:
bundled(golang(github.com/opencontainers/go-digest)) =
c9281466c8b2f606084ac71339773efd177436e7
-Provides:
bundled(golang(github.com/opencontainers/image-spec)) = v1.0.1
-Provides:
bundled(golang(github.com/opencontainers/runc)) =
96ec2177ae841256168fcf76954f7177af9446eb
-Provides:
bundled(golang(github.com/opencontainers/runtime-spec)) =
eba862dc2470385a233c7507392675cbeadf7353
-Provides:
bundled(golang(github.com/opencontainers/runtime-tools)) = v0.6.0
-Provides:
bundled(golang(github.com/opencontainers/selinux)) =
b6fa367ed7f534f9ba25391cc2d467085dbb445a
-Provides:
bundled(golang(github.com/pborman/uuid)) =
c65b2f87fee37d1c7854c9164a450713c28d50cd
-Provides:
bundled(golang(github.com/pkg/errors)) = v0.8.0
-Provides:
bundled(golang(github.com/prometheus/client_golang)) =
f4fb1b73fb099f396a7f0036bf86aa8def4ed823
-Provides:
bundled(golang(github.com/prometheus/client_model)) =
99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
-Provides:
bundled(golang(github.com/prometheus/common)) =
89604d197083d4781071d3c65855d24ecfb0a563
-Provides:
bundled(golang(github.com/prometheus/procfs)) =
cb4147076ac75738c9a7d279075a253c0cc5acbd
-Provides:
bundled(golang(github.com/seccomp/libseccomp-golang)) =
32f571b70023028bd57d9288c20efbcb237f3ce0
-Provides:
bundled(golang(github.com/sirupsen/logrus)) = v1.0.0
-Provides:
bundled(golang(github.com/syndtr/gocapability)) =
db04d3cc01c8b54962a58ec7e491717d06cfcc16
-Provides:
bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
-Provides:
bundled(golang(github.com/urfave/cli)) =
7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
-Provides:
bundled(golang(github.com/xeipuuv/gojsonpointer)) =
4e3ac2762d5f479393488629ee9370b50873b3a6
-Provides:
bundled(golang(github.com/xeipuuv/gojsonreference)) =
bd5ef7bd5415a7ac448318e64f11a24cd21e594b
-Provides:
bundled(golang(github.com/xeipuuv/gojsonschema)) =
1d523034197ff1f222f6429836dd36a2457a1874
-Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.1-etcd.8
-Provides:
bundled(golang(golang.org/x/crypto)) =
49796115aa4b964c318aad4f3084fdb41e9aa067
-Provides:
bundled(golang(golang.org/x/net)) =
b3756b4b77d7b13260a0a2ec658753cf48922eac
-Provides:
bundled(golang(golang.org/x/oauth2)) =
a6bd8cefa1811bd24b86f8902872e4e8225f74c4
-Provides:
bundled(golang(golang.org/x/sync)) =
450f422ab23cf9881c94e2db30cac0eb1b7cf80c
-Provides:
bundled(golang(golang.org/x/sys)) =
1b2967e3c290b7c545b3db0deeda16e9be4f98a2
-Provides:
bundled(golang(golang.org/x/text)) =
19e51611da83d6be54ddafce4a4af510cb3e9ea4
-Provides:
bundled(golang(golang.org/x/time)) =
f51c12702a4d776e4c1fa9b0fabab841babae631
-Provides:
bundled(golang(google.golang.org/genproto)) =
d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
-Provides:
bundled(golang(google.golang.org/grpc)) = v1.12.0
-Provides: bundled(golang(gopkg.in/inf.v0)) =
3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1
-Provides: bundled(golang(gotest.tools)) = v2.1.0
-Provides: bundled(golang(k8s.io/api)) = kubernetes-1.12.0
-Provides: bundled(golang(k8s.io/apimachinery)) = kubernetes-1.12.0
-Provides: bundled(golang(k8s.io/apiserver)) = kubernetes-1.12.0
-Provides: bundled(golang(k8s.io/client-go)) = kubernetes-1.12.0
-Provides: bundled(golang(k8s.io/kubernetes)) = v1.12.0
-Provides: bundled(golang(k8s.io/utils)) = cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
+BuildRequires: systemd-rpm-macros
+BuildRequires:
golang(github.com/BurntSushi/toml)
+%if %{without bootstrap}
+BuildRequires:
golang(github.com/containerd/aufs)
+%endif
+BuildRequires:
golang(github.com/containerd/btrfs)
+BuildRequires:
golang(github.com/containerd/cgroups)
+BuildRequires:
golang(github.com/containerd/console)
+BuildRequires:
golang(github.com/containerd/continuity)
+BuildRequires:
golang(github.com/containerd/continuity/fs)
+BuildRequires:
golang(github.com/containerd/continuity/fs/fstest)
+BuildRequires:
golang(github.com/containerd/continuity/sysx)
+%if %{without bootstrap}
+BuildRequires:
golang(github.com/containerd/cri)
+BuildRequires:
golang(github.com/containerd/cri/cli)
+%endif
+BuildRequires:
golang(github.com/containerd/fifo)
+BuildRequires:
golang(github.com/containerd/go-runc)
+BuildRequires:
golang(github.com/containerd/ttrpc)
+BuildRequires:
golang(github.com/containerd/ttrpc/plugin)
+BuildRequires:
golang(github.com/containerd/typeurl)
+%if %{without bootstrap}
+BuildRequires:
golang(github.com/containerd/zfs)
+%endif
+BuildRequires:
golang(github.com/docker/distribution/reference)
+BuildRequires:
golang(github.com/docker/go-events)
+BuildRequires:
golang(github.com/docker/go-metrics)
+BuildRequires:
golang(github.com/docker/go-units)
+BuildRequires:
golang(github.com/gogo/googleapis/google/rpc)
+BuildRequires:
golang(github.com/gogo/protobuf/gogoproto)
+BuildRequires:
golang(github.com/gogo/protobuf/proto)
+BuildRequires:
golang(github.com/gogo/protobuf/protoc-gen-gogo/descriptor)
+BuildRequires:
golang(github.com/gogo/protobuf/protoc-gen-gogo/generator)
+BuildRequires:
golang(github.com/gogo/protobuf/sortkeys)
+BuildRequires:
golang(github.com/gogo/protobuf/types)
+BuildRequires:
golang(github.com/gogo/protobuf/vanity)
+BuildRequires:
golang(github.com/gogo/protobuf/vanity/command)
+BuildRequires:
golang(github.com/grpc-ecosystem/go-grpc-prometheus)
+BuildRequires:
golang(github.com/opencontainers/go-digest)
+BuildRequires:
golang(github.com/opencontainers/image-spec/identity)
+BuildRequires:
golang(github.com/opencontainers/image-spec/specs-go)
+BuildRequires:
golang(github.com/opencontainers/image-spec/specs-go/v1)
+BuildRequires:
golang(github.com/opencontainers/runc/libcontainer/system)
+BuildRequires:
golang(github.com/opencontainers/runc/libcontainer/user)
+BuildRequires:
golang(github.com/opencontainers/runtime-spec/specs-go)
+BuildRequires:
golang(github.com/pkg/errors)
+BuildRequires:
golang(github.com/prometheus/client_golang/prometheus)
+BuildRequires:
golang(github.com/sirupsen/logrus)
+BuildRequires:
golang(github.com/syndtr/gocapability/capability)
+BuildRequires:
golang(github.com/urfave/cli)
+BuildRequires: golang(go.etcd.io/bbolt)
+BuildRequires:
golang(golang.org/x/net/context)
+BuildRequires:
golang(golang.org/x/net/context/ctxhttp)
+BuildRequires:
golang(golang.org/x/sync/errgroup)
+BuildRequires:
golang(golang.org/x/sys/unix)
+BuildRequires:
golang(google.golang.org/grpc)
+BuildRequires:
golang(google.golang.org/grpc/codes)
+BuildRequires:
golang(google.golang.org/grpc/grpclog)
+BuildRequires:
golang(google.golang.org/grpc/health)
+BuildRequires:
golang(google.golang.org/grpc/health/grpc_health_v1)
+BuildRequires:
golang(google.golang.org/grpc/metadata)
+BuildRequires:
golang(google.golang.org/grpc/status)
+BuildRequires: golang(gotest.tools/assert)
+BuildRequires: golang(gotest.tools/assert/cmp)
+
+%if %{with check}
+# Tests
+BuildRequires:
golang(github.com/containerd/continuity/testutil)
+BuildRequires:
golang(github.com/containerd/continuity/testutil/loopback)
+BuildRequires:
golang(github.com/google/go-cmp/cmp)
+BuildRequires:
golang(github.com/google/go-cmp/cmp/cmpopts)
+%endif
+Requires: runc
%description
-containerd is an industry-standard container runtime with an emphasis on
-simplicity, robustness and portability. It is available as a daemon for Linux
-and Windows, which can manage the complete container lifecycle of its host
-system: image transfer and storage, container execution and supervision,
-low-level storage and network attachments, etc.
+%{common_description}
+%gopkg
%prep
-%autosetup
-
+%goprep
+%if %{without bootstrap}
%build
-%gobuildroot
-export LDFLAGS="-X %{goipath}/version.Version=%{version}"
-%gobuild -o _bin/containerd %{goipath}/cmd/containerd
-%gobuild -o _bin/containerd-shim %{goipath}/cmd/containerd-shim
-%gobuild -o _bin/ctr %{goipath}/cmd/ctr
+export LDFLAGS="-X %{goipath}/version.Version=%{version} "
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
mkdir _man
go-md2man -in docs/man/containerd.1.md -out _man/containerd.1
go-md2man -in docs/man/containerd-config.1.md -out _man/containerd-config.1
go-md2man -in docs/man/ctr.1.md -out _man/ctr.1
go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.toml.5
-
+%else
+rm -rf cmd
+%endif
%install
-install -D -p -m 0755 _bin/containerd %{buildroot}%{_bindir}/containerd
-install -D -p -m 0755 _bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
-install -D -p -m 0755 _bin/ctr %{buildroot}%{_bindir}/ctr
+%gopkginstall
+%if %{without bootstrap}
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
install -D -p -m 0644 _man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
install -D -p -m 0644 _man/containerd-config.1
%{buildroot}%{_mandir}/man1/containerd-config.1
install -D -p -m 0644 _man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1
install -D -p -m 0644 _man/containerd-config.toml.5
%{buildroot}%{_mandir}/man5/containerd-config.toml.5
install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
-
-
-%if %{with tests}
-%check
-%gochecks
%endif
-
%post
%systemd_post containerd.service
-
%preun
%systemd_preun containerd.service
-
%postun
%systemd_postun_with_restart containerd.service
+%if %{with check}
+%check
+%gocheck -d mount -t snapshots
+%endif
+%if %{without bootstrap}
%files
-%license LICENSE
-%doc README.md
-%{_bindir}/containerd
-%{_bindir}/containerd-shim
-%{_bindir}/ctr
+%license LICENSE NOTICE
+%doc docs PLUGINS.md ROADMAP.md RUNC.md SCOPE.md code-of-conduct.md BUILDING.md
+%doc README.md RELEASES.md
+%{_bindir}/*
%{_mandir}/man1/containerd.1*
%{_mandir}/man1/containerd-config.1*
%{_mandir}/man1/ctr.1*
@@ -202,9 +175,14 @@ install -D -p -m 0644 %{S:2}
%{buildroot}%{_sysconfdir}/containerd/config.toml
%{_unitdir}/containerd.service
%dir %{_sysconfdir}/containerd
%config(noreplace) %{_sysconfdir}/containerd/config.toml
+%endif
+%gopkgfiles
%changelog
+* Wed May 01 15:33:19 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
1.2.6-1.20190501gitd68b593
+- Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2
+
* Tue Feb 26 2019 Carl George <carl(a)george.computer> - 1.2.4-1
- Latest upstream
diff --git a/sources b/sources
index a5e66e7..b6a183f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (containerd-1.2.4.tar.gz) =
8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
+SHA512 (containerd-d68b593de4ab10bb8b4fd64560e10d43c7156db2.tar.gz) =
565b4a19f1e5058b9fa2b16c3514a13d69482275dc08ed1073ccdb6561b3dd158bb0672d763625bae10358655280ec9b0c080039f70ca48a14e9c92344e1bae7