diff --git a/containerd.spec b/containerd.spec index d254bc7f0d37af94750b4a7aa50933474034b2ce..6428c0e7b2b2797ce4693097459fb1988519d353 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 13 +Release: 14 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -68,13 +68,20 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Tue May 21 2024 zhangzikang - 1.6.22-14 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add loong64 to THP patch, fix build error for loongarch64 + fix incorrect dates + * 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 +* Sun Apr 07 2024 zhongjiawei - 1.6.22-12 - Type:bugfix - ID:NA - SUG:NA @@ -146,7 +153,7 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml - SUG:NA - DESC:upgrade to contained 1.6.22 -* Fri July 21 2023 vegbir - 1.6.21-1 +* Fri Jul 21 2023 vegbir - 1.6.21-1 - Type:bugfix - ID:NA - SUG:NA @@ -176,7 +183,7 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml - SUG:NA - DESC:fix CVE-2023-25153 and CVE-2023-25173 -* Thu Dec 16 2022 zhongjiawei - 1.2.0-308 +* Fri Dec 16 2022 zhongjiawei - 1.2.0-308 - Type:bugfix - ID:NA - SUG:NA diff --git a/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch b/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch index 786c0b586f9abbb6b55daabab818f82831b55e40..b112b8e7699ce7902d7bd95765c4ba51faad8de3 100644 --- a/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch +++ b/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch @@ -11,12 +11,14 @@ Subject: [PATCH] containerd:disable Transparent HugePage for shim process if sys/thp_amd64.go | 3 ++ sys/thp_arm64.go | 3 ++ sys/thp_riscv64.go | 3 ++ + sys/thp_loong64.go | 3 ++ .../github.com/containerd/go-runc/monitor.go | 54 ++++++++++++------- - 7 files changed, 104 insertions(+), 20 deletions(-) + 8 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 sys/thp.go create mode 100644 sys/thp_amd64.go create mode 100644 sys/thp_arm64.go create mode 100644 sys/thp_riscv64.go + create mode 100644 sys/thp_loong64.go diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go index 965a5cf..af4917c 100644 @@ -147,6 +149,15 @@ index 0000000..a6db8d6 +package sys + +const PRCTL_SYSCALL = 167 +diff --git a/sys/thp_loong64.go b/sys/thp_loong64.go +new file mode 100644 +index 0000000..a6db8d6 +--- /dev/null ++++ b/sys/thp_loong64.go +@@ -0,0 +1,3 @@ ++package sys ++ ++const PRCTL_SYSCALL = 167 diff --git a/vendor/github.com/containerd/go-runc/monitor.go b/vendor/github.com/containerd/go-runc/monitor.go index 73c8ac1..c7b4451 100644 --- a/vendor/github.com/containerd/go-runc/monitor.go