From 87383d05a2f1e93d222b523e8348b13165c89349 Mon Sep 17 00:00:00 2001 From: zhongjiawei Date: Fri, 12 Apr 2024 11:14:38 +0800 Subject: [PATCH] containerd:enable make cri --- containerd.spec | 10 ++++++++-- git-commit | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/containerd.spec b/containerd.spec index b414c54..d254bc7 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 12 +Release: 13 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -42,7 +42,7 @@ ln -fs $PWD $GO_BUILD_PATH/src/%{goipath} cd $GO_BUILD_PATH/src/%{goipath} export GO111MODULE=off export GOPATH=$GO_BUILD_PATH:%{gopath} -export BUILDTAGS="no_btrfs no_cri" +export BUILDTAGS="no_btrfs" make %install @@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Tue Apr 23 2024 zhongjiawei - 1.6.22-13 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:enable cri + * Mon Apr 07 2024 zhongjiawei - 1.6.22-12 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index 18344d5..f62ca5a 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -bb347b1bec7ed8dc34c91ee87dde406691c5080e +dde8d115e2117709ad9d6e43ce328a706c779158 -- Gitee