From 131017a2a5006fabb91447d9132463f8538cdb31 Mon Sep 17 00:00:00 2001 From: ShiXin Date: Fri, 1 Mar 2024 18:18:14 +0800 Subject: [PATCH] embedded: add cpuset-cgv1 and freezer-cgv1 option and disable by default Signed-off-by: ShiXin (cherry picked from commit 48d029de4539ee11c4bfd361accdf3d70747a50c) --- ...-cpuset-cgv1-and-freezer-cgv1-option.patch | 30 +++++++++++++++++++ systemd.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch diff --git a/embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch b/embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch new file mode 100644 index 0000000..d1940b6 --- /dev/null +++ b/embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch @@ -0,0 +1,30 @@ +From 23c1e8fa35af234cdaf2452e1c0c85232b7e83df Mon Sep 17 00:00:00 2001 +From: ShiXin +Date: Fri, 1 Mar 2024 16:54:54 +0800 +Subject: [PATCH] [Backport] embedded: add cpuset-cgv1 and freezer-cgv1 option + and disable by default + +reason: No need to enable in embedded environment + +Signed-off-by: ShiXin +--- + embedded/meson_options.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/embedded/meson_options.txt b/embedded/meson_options.txt +index 24a44c5..69c195f 100644 +--- a/embedded/meson_options.txt ++++ b/embedded/meson_options.txt +@@ -460,3 +460,9 @@ option('analyze', type: 'boolean', value: 'true', + + option('bpf-framework', type : 'combo', choices : ['auto', 'true', 'false'], + description: 'build BPF programs from source code in restricted C') ++ ++option('cpuset-cgv1', type : 'boolean', value : 'false', ++ description : 'disable cgroup v1 cpuset support by default') ++ ++option('freezer-cgv1', type : 'boolean', value : 'false', ++ description : 'disable cgroup v1 freezer support by default') +-- +2.12.3 + diff --git a/systemd.spec b/systemd.spec index b31ea37..27ffe15 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 71 +Release: 72 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -699,6 +699,7 @@ Patch9060: embedded-modify-dns-server-address-to-avoid-security.patch Patch9061: add-support-to-relabel-systemd-process-for-embedded.patch Patch9062: embedded-add-noexec-mount-option-to-strenthen-tmp-pa.patch Patch9063: embedded-use-yocto-configs.patch +Patch9064: embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel @@ -2135,6 +2136,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Fri Mar 1 2024 shixin - 249-72 +- embedded: add cpuset-cgv1 and freezer-cgv1 option and disable by default + * Thu Feb 29 2024 licunlong - 249-71 - fix the compilation warning caused by misusing const