From: Youngjae Cho <y0.cho@samsung.com>
Date: Mon, 30 Sep 2024 02:22:45 +0000 (+0900)
Subject: tizen: Exclude 50-pid-max.conf from movable profile
X-Git-Tag: accepted/tizen/unified/20241004.041840^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=HEAD;p=platform%2Fupstream%2Fsystemd.git

tizen: Exclude 50-pid-max.conf from movable profile

The movable profile uses its own pid max.

Change-Id: I7d046352432cbb769da92d69053ad2a36398d2f4
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
---

diff --git a/meson_options.txt b/meson_options.txt
index 59bb1f8..4f42a0f 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 45dd3fe..933dd12 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 3f072e3..2ed9a18 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