From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 May 2021 16:49:04 +0000 (+0200)
Subject: meson: drop "_YES_NO" variables
X-Git-Tag: v249-rc1~210^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd3a3e31b3f4a6760780c01fe13163159b6ccec1;p=thirdparty%2Fsystemd.git

meson: drop "_YES_NO" variables

We can generate the right string in the template directly.
---

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
index 9c6a2d05586..d8612b226eb 100644
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@@ -7,8 +7,8 @@
 <!ENTITY userenvgeneratordir "{{USER_ENV_GENERATOR_DIR}}">
 <!ENTITY CERTIFICATE_ROOT "{{CERTIFICATE_ROOT}}">
 <!ENTITY FALLBACK_HOSTNAME "{{FALLBACK_HOSTNAME}}">
-<!ENTITY MEMORY_ACCOUNTING_DEFAULT "{{MEMORY_ACCOUNTING_DEFAULT_YES_NO}}">
-<!ENTITY KILL_USER_PROCESSES "{{KILL_USER_PROCESSES_YES_NO}}">
+<!ENTITY MEMORY_ACCOUNTING_DEFAULT "{{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}">
+<!ENTITY KILL_USER_PROCESSES "{{ 'yes' if KILL_USER_PROCESSES else 'no' }}">
 <!ENTITY DEBUGTTY "{{DEBUGTTY}}">
 <!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}">
 <!ENTITY fedora_latest_version "34">
diff --git a/meson.build b/meson.build
index 41129b92c4d..802f5bb69b9 100644
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,6 @@ conf.set_quoted('DOCUMENT_ROOT',                              join_paths(pkgdata
 conf.set_quoted('SYSTEMD_HOMEWORK_PATH',                      join_paths(rootlibexecdir, 'systemd-homework'))
 conf.set_quoted('SYSTEMD_USERWORK_PATH',                      join_paths(rootlibexecdir, 'systemd-userwork'))
 conf.set10('MEMORY_ACCOUNTING_DEFAULT',                       memory_accounting_default)
-conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO',           memory_accounting_default ? 'yes' : 'no')
 conf.set('STATUS_UNIT_FORMAT_DEFAULT',                        'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
 conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR',             status_unit_format_default)
 
@@ -811,7 +810,6 @@ conf.set10('GROUP_RENDER_UACCESS', group_render_mode != '0666')
 
 kill_user_processes = get_option('default-kill-user-processes')
 conf.set10('KILL_USER_PROCESSES', kill_user_processes)
-conf.set_quoted('KILL_USER_PROCESSES_YES_NO', kill_user_processes ? 'yes' : 'no')
 
 dns_servers = get_option('dns-servers')
 conf.set_quoted('DNS_SERVERS', dns_servers)