From ddeb57f504665f7828a09ceca8b275e663f771b5 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Tue, 4 Apr 2023 11:51:12 +0800 Subject: [PATCH] build with local vendor and do not provide devel subpackage Signed-off-by: Chunmei Xu --- containerd.spec | 139 +++--------------------------------------------- 1 file changed, 6 insertions(+), 133 deletions(-) diff --git a/containerd.spec b/containerd.spec index c82e191..37d17a0 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,8 +1,6 @@ -%define anolis_release 1 -# Generated by go2rpm -# arm support not fully implemented: not implemented +%define anolis_release 2 + %bcond_without check -%bcond_with bootstrap # https://github.com/containerd/containerd %global goipath github.com/containerd/containerd @@ -39,125 +37,8 @@ Patch0: 0001-Revert-commit-for-Windows-metrics.patch Patch1: 0002-Remove-windows-only-dep.patch BuildRequires: btrfs-progs-devel -BuildRequires: go-md2man BuildRequires: systemd-rpm-macros -%if %{without bootstrap} -BuildRequires: golang(github.com/containerd/aufs/plugin) -%endif -BuildRequires: golang(github.com/containerd/btrfs) -BuildRequires: golang(github.com/containerd/cgroups) -BuildRequires: golang(github.com/containerd/cgroups/stats/v1) -BuildRequires: golang(github.com/containerd/cgroups/v2) -BuildRequires: golang(github.com/containerd/cgroups/v2/stats) -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) -BuildRequires: golang(github.com/containerd/fifo) -BuildRequires: golang(github.com/containerd/go-cni) -BuildRequires: golang(github.com/containerd/go-runc) -BuildRequires: golang(github.com/containerd/imgcrypt) -BuildRequires: golang(github.com/containerd/imgcrypt/images/encryption) -BuildRequires: golang(github.com/containerd/nri) -BuildRequires: golang(github.com/containerd/nri/types/v1) -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/plugin) -%endif -BuildRequires: golang(github.com/containernetworking/plugins/pkg/ns) -BuildRequires: golang(github.com/coreos/go-systemd/v22/daemon) -BuildRequires: golang(github.com/davecgh/go-spew/spew) -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/emicklei/go-restful) -BuildRequires: golang(github.com/fsnotify/fsnotify) -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/google/uuid) -BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus) -BuildRequires: golang(github.com/hashicorp/go-multierror) -BuildRequires: golang(github.com/imdario/mergo) -BuildRequires: golang(github.com/klauspost/compress/zstd) -# BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options) -# BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats) -BuildRequires: golang(github.com/moby/locker) -BuildRequires: golang(github.com/moby/sys/mountinfo) -BuildRequires: golang(github.com/moby/sys/symlink) -BuildRequires: golang(github.com/opencontainers/go-digest) -BuildRequires: golang(github.com/opencontainers/go-digest/digestset) -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/user) -BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go) -BuildRequires: golang(github.com/opencontainers/selinux/go-selinux) -BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label) -BuildRequires: golang(github.com/pelletier/go-toml) -BuildRequires: golang(github.com/pkg/errors) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/tchap/go-patricia/patricia) -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/sync/semaphore) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(google.golang.org/grpc) -BuildRequires: golang(google.golang.org/grpc/backoff) -BuildRequires: golang(google.golang.org/grpc/codes) -BuildRequires: golang(google.golang.org/grpc/credentials) -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/v3/assert) -BuildRequires: golang(gotest.tools/v3/assert/cmp) -BuildRequires: golang(k8s.io/api/core/v1) -BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors) -BuildRequires: golang(k8s.io/apimachinery/pkg/api/resource) -BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1) -BuildRequires: golang(k8s.io/apimachinery/pkg/types) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/clock) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream/spdy) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/net) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/remotecommand) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/runtime) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/sets) -BuildRequires: golang(k8s.io/apiserver/pkg/server/httplog) -BuildRequires: golang(k8s.io/apiserver/pkg/util/wsstream) -BuildRequires: golang(k8s.io/client-go/tools/remotecommand) -BuildRequires: golang(k8s.io/client-go/util/cert) -BuildRequires: golang(k8s.io/component-base/logs/logreduction) -BuildRequires: golang(k8s.io/cri-api/pkg/apis) -BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2) -BuildRequires: golang(k8s.io/klog/v2) -BuildRequires: golang(k8s.io/utils/exec) - -%if %{with check} -# Tests -BuildRequires: golang(github.com/containerd/continuity/testutil) -BuildRequires: golang(github.com/containerd/continuity/testutil/loopback) -BuildRequires: golang(github.com/golang/protobuf/proto) -BuildRequires: golang(github.com/google/go-cmp/cmp) -BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/require) -%endif +BuildRequires: go-md2man Requires: runc @@ -180,7 +61,6 @@ The %{name}-doc package contains documentation files for %{name}. # Used only for generation: rm -rf cmd/protoc-gen-gogoctrd -%if %{without bootstrap} %build export LDFLAGS="-X %{goipath}/version.Version=%{version} " for cmd in cmd/* ; do @@ -192,13 +72,8 @@ go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.t %{gobuilddir}/bin/gen-manpages containerd.8 _man %{gobuilddir}/bin/gen-manpages ctr.8 _man rm %{gobuilddir}/bin/gen-manpages -%else -rm -rf cmd -%endif %install -%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.8 %{buildroot}%{_mandir}/man8/containerd.8 @@ -207,7 +82,6 @@ install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8 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 -%endif %post %systemd_post containerd.service @@ -225,7 +99,6 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %generate_compatibility_deps -%if %{without bootstrap} %files %license LICENSE NOTICE @@ -239,15 +112,15 @@ 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 %files doc %doc docs ROADMAP.md SCOPE.md code-of-conduct.md BUILDING.md %doc README.md RELEASES.md %changelog +* Tue Apr 04 2023 Chunmei Xu - 1.6.19-2 +- build with local vendor and do not provide devel subpackage + * Tue Mar 07 2023 yuanhui - 1.6.19-1 - Update to v1.6.19 - Add abi and doc files -- Gitee