diff --git a/0001-Revert-commit-for-Windows-metrics.patch b/0001-Revert-commit-for-Windows-metrics.patch index 38f3f13cee693f88bdda22ad4390425f10a12c0f..568f98ff13aca3af14af50b6d3f06de46994d696 100644 --- a/0001-Revert-commit-for-Windows-metrics.patch +++ b/0001-Revert-commit-for-Windows-metrics.patch @@ -15,7 +15,7 @@ diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics. index a83e45ef..f8371401 100644 --- a/cmd/ctr/commands/tasks/metrics.go +++ b/cmd/ctr/commands/tasks/metrics.go -@@ -25,9 +25,6 @@ import ( +@@ -23,9 +23,6 @@ import ( "os" "text/tabwriter" @@ -25,7 +25,7 @@ index a83e45ef..f8371401 100644 "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/typeurl" "github.com/urfave/cli" -@@ -79,42 +76,12 @@ var metricsCommand = cli.Command{ +@@ -77,42 +74,12 @@ var metricsCommand = cli.Command{ if err != nil { return err } @@ -68,7 +68,7 @@ index a83e45ef..f8371401 100644 return w.Flush() case formatJSON: marshaledJSON, err := json.MarshalIndent(anydata, "", " ") -@@ -128,83 +95,3 @@ var metricsCommand = cli.Command{ +@@ -126,83 +93,3 @@ var metricsCommand = cli.Command{ } }, } diff --git a/0002-Remove-windows-only-dep.patch b/0002-Remove-windows-only-dep.patch index 4411605e01f70ff2161a21b5d59bb4e2e48d1bf0..92a2856cfbce19586f99b246c9cd1b97d07e4ebd 100644 --- a/0002-Remove-windows-only-dep.patch +++ b/0002-Remove-windows-only-dep.patch @@ -1,16 +1,17 @@ -diff --color -Naur a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go ---- a/pkg/cri/server/helpers.go 2021-11-17 21:04:57.000000000 +0100 -+++ b/pkg/cri/server/helpers.go 2021-11-22 22:39:01.743745977 +0100 -@@ -23,7 +23,7 @@ - "strconv" - "strings" +diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go +index a8498116d..3682be668 100644 +--- a/pkg/cri/server/helpers.go ++++ b/pkg/cri/server/helpers.go +@@ -40,7 +40,7 @@ import ( + runtimespec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/sirupsen/logrus" - runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - clabels "github.com/containerd/containerd/labels" -@@ -366,8 +366,8 @@ + imagedigest "github.com/opencontainers/go-digest" + "github.com/pelletier/go-toml" + "golang.org/x/net/context" +@@ -366,8 +366,8 @@ func getRuntimeOptionsType(t string) interface{} { return &runcoptions.Options{} case plugin.RuntimeLinuxV1: return &runctypes.RuncOptions{} diff --git a/containerd-1.5.9.tar.gz b/containerd-1.6.19.tar.gz similarity index 48% rename from containerd-1.5.9.tar.gz rename to containerd-1.6.19.tar.gz index 959de32ed409d1416e5823b1e5226bc0b58be414..3300072be753382c42635f5051411182fbcedaf0 100644 Binary files a/containerd-1.5.9.tar.gz and b/containerd-1.6.19.tar.gz differ diff --git a/containerd.spec b/containerd.spec index 6926c09cb99a990c486ba7d6227ad6f300d99652..c82e191e4b7a9bc3c423fa2de704ebbf7a1e5244 100644 --- a/containerd.spec +++ b/containerd.spec @@ -6,7 +6,7 @@ # https://github.com/containerd/containerd %global goipath github.com/containerd/containerd -Version: 1.5.9 +Version: 1.6.19 %gometa @@ -166,6 +166,14 @@ Requires: runc %gopkg +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %prep %goprep -k %autopatch -p1 @@ -215,12 +223,15 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %gocheck -d pkg/cri/server -t integration %endif +%generate_compatibility_deps + %if %{without bootstrap} %files %license LICENSE NOTICE -%doc docs ROADMAP.md SCOPE.md code-of-conduct.md BUILDING.md -%doc README.md RELEASES.md + %{_bindir}/* +%dir %{abidir} +%{abidir}/*-option.list %{_mandir}/man8/containerd.8* %{_mandir}/man8/containerd-config.8* %{_mandir}/man8/ctr.8* @@ -232,6 +243,14 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %gopkgfiles +%files doc +%doc docs ROADMAP.md SCOPE.md code-of-conduct.md BUILDING.md +%doc README.md RELEASES.md + %changelog +* Tue Mar 07 2023 yuanhui - 1.6.19-1 +- Update to v1.6.19 +- Add abi and doc files + * Thu Mar 10 2022 Yuanhong Peng - 1.5.9-1 - Init from upstream v1.5.9