!567 [sync] PR-566: embedded: add cpuset-cgv1 and freezer-cgv1 option and disable by default

From: @openeuler-sync-bot 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
This commit is contained in:
openeuler-ci-bot 2024-03-04 08:19:14 +00:00 committed by Gitee
commit 9e3840e74e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 23c1e8fa35af234cdaf2452e1c0c85232b7e83df Mon Sep 17 00:00:00 2001
From: ShiXin <shixin21@huawei.com>
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 <shixin21@huawei.com>
---
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

View File

@ -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 <shixin21@huawei.com> - 249-72
- embedded: add cpuset-cgv1 and freezer-cgv1 option and disable by default
* Thu Feb 29 2024 licunlong <licunlong1@huawei.com> - 249-71
- fix the compilation warning caused by misusing const