diff options
| author | Youngjae Cho <y0.cho@samsung.com> | 2024-09-30 11:22:45 +0900 |
|---|---|---|
| committer | Youngjae Cho <y0.cho@samsung.com> | 2024-09-30 13:22:48 +0900 |
| commit | 64a3ba649355101bc204d2a1d4e012bb12605e10 (patch) | |
| tree | 74ff223771b34d98b029259636b9566b9ea61c55 | |
| parent | 153a4244d86a7b7bad71d3d3e236b3d398f46959 (diff) | |
| download | systemd-accepted/tizen_unified.tar.gz systemd-accepted/tizen_unified.tar.bz2 systemd-accepted/tizen_unified.zip | |
tizen: Exclude 50-pid-max.conf from movable profileHEADtizen_9.0_m2_releaseaccepted/tizen/unified/20241004.041840accepted/tizen/9.0/unified/20241030.233904tizen_9.0tizenaccepted/tizen_unifiedaccepted/tizen_9.0_unified
The movable profile uses its own pid max.
Change-Id: I7d046352432cbb769da92d69053ad2a36398d2f4
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | packaging/systemd.spec | 3 | ||||
| -rw-r--r-- | sysctl.d/meson.build | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index 59bb1f8bee..4f42a0f306 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -353,3 +353,5 @@ option('fuzzbuzz-engine', type : 'string', description : 'the name of the FuzzBuzz fuzzing engine') option('fuzzbuzz-engine-dir', type : 'string', description : 'the directory where the FuzzBuzz fuzzing engine is') +option('sysctl-use-pid-max-conf', type : 'boolean', value : 'true', + description : 'use sysctl pid-max.conf configuration file') diff --git a/packaging/systemd.spec b/packaging/systemd.spec index 45dd3fe36b..933dd128e0 100644 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -239,6 +239,9 @@ cp %{SOURCE8} . %if 0%{?WITH_SMACK} -Dsmack-run-label=System::Privileged \ %endif +%if "%{mv_prj}" == "1" + -Dsysctl-use-pid-max-conf=false \ +%endif -Dinstall-tests=true \ -Ddefault-hierarchy=legacy \ -Db_pie=true diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index 3f072e3db7..2ed9a18f61 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -9,7 +9,7 @@ in_files = [] # Kernel determines PID_MAX_LIMIT by # #define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \ # (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT)) -if cc.sizeof('long') > 4 +if cc.sizeof('long') > 4 and get_option('sysctl-use-pid-max-conf') install_data('50-pid-max.conf', install_dir : sysctldir) endif |