diff --git a/containerd.spec b/containerd.spec index d254bc7f0d37af94750b4a7aa50933474034b2ce..dd816f5efdc6d02d3f882996bcead74c047cf615 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,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Tue May 21 2024 Wenlong Zhang - 1.6.22-14 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix build error for loong64 + * Tue Apr 23 2024 zhongjiawei - 1.6.22-13 - Type:bugfix - CVE:NA diff --git a/patch/0036-fix-build-error-for-loong64.patch b/patch/0036-fix-build-error-for-loong64.patch new file mode 100644 index 0000000000000000000000000000000000000000..b4fd10a22d9986cfd4dbc2a86f16d2ae98257a3f --- /dev/null +++ b/patch/0036-fix-build-error-for-loong64.patch @@ -0,0 +1,22 @@ +From 538cffe9ffd2205a4d5e9751b3722a7df78730d5 Mon Sep 17 00:00:00 2001 +From: build +Date: Tue, 21 May 2024 06:48:42 +0000 +Subject: [PATCH] fix build error for loong64 + +--- + sys/thp_loong64.go | 3 +++ + 1 file changed, 3 insertions(+) + create mode 100644 sys/thp_loong64.go + +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 +-- +2.43.0 + diff --git a/series.conf b/series.conf index 5aab0b1c74682cbe0caf5728ce813597b4262e1f..64e83252a1a071f31ca0fd2e881c6a585e4ad532 100644 --- a/series.conf +++ b/series.conf @@ -32,3 +32,4 @@ patch/0032-containerd-vendor-golang.org-x-net-v0.17.0.patch patch/0033-containerd-Fix-missing-closed-fifo.patch patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch patch/0035-containerd-modify-Makefile-for-go-build-options.patch +patch/0036-fix-build-error-for-loong64.patch