diff --git a/kata-containers.spec b/kata-containers.spec index 172a6f1c45562d56fb0e56540b97cd9ee5db959e..a05b33c7283c974d7ac671ffdd33ab6ed5cc9bad 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 2.1.0 -%define RELEASE 32 +%define RELEASE 33 Name: kata-containers Version: %{VERSION} @@ -109,6 +109,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Tue Sep 2023 xiadanni - 2.1.0-33 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:update cgroup-rs crate to fix for set_kmem_limit error + * Mon Mar 6 2023 zhukeqian - 2.1.0-32 - Type:bugfix - ID:NA diff --git a/patches/0035-update-cgroup-rs-crate.patch b/patches/0035-update-cgroup-rs-crate.patch new file mode 100644 index 0000000000000000000000000000000000000000..9676f0826679ee922bb2f4e33d18d9e0234fb550 --- /dev/null +++ b/patches/0035-update-cgroup-rs-crate.patch @@ -0,0 +1,111 @@ +From b5ce74b04b457d54104113c6fc7e507ead3ac26d Mon Sep 17 00:00:00 2001 +From: Vanient +Date: Mon, 4 Sep 2023 15:36:45 +0800 +Subject: [PATCH] update cgroup-rs crate + +update cgroup-rs crate to fix "unable to write to a control group file" + +Signed-off-by: Vanient +--- + src/agent/Cargo.lock | 25 +++++++++++++++++++------ + src/agent/Cargo.toml | 2 +- + src/agent/rustjail/Cargo.toml | 2 +- + 3 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock +index 87807a3..799eec1 100644 +--- a/src/agent/Cargo.lock ++++ b/src/agent/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "addr2line" + version = "0.14.0" +@@ -147,13 +149,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "cgroups-rs" +-version = "0.2.5" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d4cec688ee0fcd143ffd7893ce2c9857bfc656eb1f2a27202244b72f08f5f8ed" ++checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2" + dependencies = [ + "libc", + "log", +- "nix 0.20.0", ++ "nix 0.24.3", + "regex", + ] + +@@ -510,9 +512,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.91" ++version = "0.2.147" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" ++checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + + [[package]] + name = "libflate" +@@ -727,6 +729,17 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "nix" ++version = "0.24.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "libc", ++] ++ + [[package]] + name = "ntapi" + version = "0.3.6" +@@ -877,7 +890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" + dependencies = [ + "libc", +- "nix 0.19.1", ++ "nix 0.20.0", + ] + + [[package]] +diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml +index 195b53b..3405827 100644 +--- a/src/agent/Cargo.toml ++++ b/src/agent/Cargo.toml +@@ -45,7 +45,7 @@ tempfile = "3.1.0" + prometheus = { version = "0.9.0", features = ["process"] } + procfs = "0.7.9" + anyhow = "1.0.32" +-cgroups = { package = "cgroups-rs", version = "0.2.5" } ++cgroups = { package = "cgroups-rs", version = "0.2.11" } + + [workspace] + members = [ +diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml +index 55e59f4..7d59d2b 100644 +--- a/src/agent/rustjail/Cargo.toml ++++ b/src/agent/rustjail/Cargo.toml +@@ -23,7 +23,7 @@ scan_fmt = "0.2" + regex = "1.1" + path-absolutize = "1.2.0" + anyhow = "1.0.32" +-cgroups = { package = "cgroups-rs", version = "0.2.5" } ++cgroups = { package = "cgroups-rs", version = "0.2.11" } + tempfile = "3.1.0" + rlimit = "0.5.3" + +-- +2.33.0 + diff --git a/series.conf b/series.conf index 3cd4447c63a96ff78b0b103512e7925e316e1e99..79a6e9926d60893f47beeeef7c30e3181628af6f 100644 --- a/series.conf +++ b/series.conf @@ -32,3 +32,4 @@ 0032-qmp-Don-t-use-deprecated-props-field-for-object-add.patch 0033-optimize-compile-options.patch 0034-stratovirt-Append-readonly-option-when-get-pflash-cm.patch +0035-update-cgroup-rs-crate.patch diff --git a/vendor.tar.gz b/vendor.tar.gz index 448b4f5a79dd6ceb4f4b3865bc3be3babc66cfc0..784b9c102c282a8ee70d8d4db9d5c2b60261d5eb 100644 Binary files a/vendor.tar.gz and b/vendor.tar.gz differ