From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 2 Feb 2021 13:38:19 +0000 (+0100)
Subject: meson: take oomd out of the doghouse
X-Git-Tag: v248-rc1~223^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8b9b2f8ab960fb96157af2f4131511a853aa9a;p=thirdparty%2Fsystemd.git

meson: take oomd out of the doghouse

It's on by default in Fedora 34 [1], so we can't say it's just a preview.

[1] https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
---

diff --git a/meson.build b/meson.build
index 0af0cce8b85..e5d7c2710e3 100644
--- a/meson.build
+++ b/meson.build
@@ -1450,14 +1450,6 @@ have = have and conf.get('HAVE_PAM') == 1
 conf.set10('ENABLE_PAM_HOME', have)
 
 have = get_option('oomd')
-if have == 'auto'
-        have = get_option('mode') == 'developer'
-else
-        have = have == 'true'
-        if have and get_option('mode') != 'developer'
-                warning('oomd is not ready for release mode (yet)')
-        endif
-endif
 conf.set10('ENABLE_OOMD', have)
 substs.set10('ENABLE_OOMD', have)
 
diff --git a/meson_options.txt b/meson_options.txt
index a4214730299..425e958ba20 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -99,7 +99,7 @@ option('coredump', type : 'boolean',
        description : 'install the coredump handler')
 option('pstore', type : 'boolean',
        description : 'install the pstore archival tool')
-option('oomd', type : 'combo', choices : ['auto', 'true', 'false'],
+option('oomd', type : 'boolean',
        description : 'install the userspace oom killer')
 option('logind', type : 'boolean',
        description : 'install the systemd-logind stack')