From 1ec57f339472f1fcb180f46eba25f2517499155f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Oct 2017 13:12:29 +0200 Subject: [PATCH] build-sys: s/ENABLE_RESOLVED/ENABLE_RESOLVE/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The configuration option was called -Dresolve, but the internal define was …RESOLVED. This options governs more than just resolved itself, so let's settle on the version without "d". --- man/dnssec-trust-anchors.d.xml | 2 +- man/nss-resolve.xml | 2 +- man/resolved.conf.xml | 2 +- man/rules/meson.build | 10 +++++----- man/systemd-resolve.xml | 2 +- man/systemd-resolved.service.xml | 2 +- meson.build | 6 +++--- shell-completion/bash/meson.build | 2 +- shell-completion/zsh/meson.build | 2 +- src/resolve/meson.build | 12 ++++++------ src/test/test-nss.c | 2 +- sysusers.d/systemd.conf.m4 | 2 +- test/meson.build | 2 +- tmpfiles.d/etc.conf.m4 | 2 +- units/meson.build | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/man/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml index 9a28862ceb..6e90e6aef9 100644 --- a/man/dnssec-trust-anchors.d.xml +++ b/man/dnssec-trust-anchors.d.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - dnssec-trust-anchors.d diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index 3a4e98e88f..f88c25c453 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -22,7 +22,7 @@ along with systemd; If not, see . --> - + nss-resolve diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 7babc5c5c4..1846df7502 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - resolved.conf diff --git a/man/rules/meson.build b/man/rules/meson.build index 6112d337e1..ae0556058e 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -11,7 +11,7 @@ manpages = [ ['dnssec-trust-anchors.d', '5', ['systemd.negative', 'systemd.positive'], - 'ENABLE_RESOLVED'], + 'ENABLE_RESOLVE'], ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'], ['file-hierarchy', '7', [], ''], ['halt', '8', ['poweroff', 'reboot'], ''], @@ -38,11 +38,11 @@ manpages = [ ['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'], ['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'ENABLE_MYHOSTNAME'], ['nss-mymachines', '8', ['libnss_mymachines.so.2'], 'ENABLE_MACHINED'], - ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVED'], + ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVE'], ['nss-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'], ['os-release', '5', [], ''], ['pam_systemd', '8', [], 'HAVE_PAM'], - ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVED'], + ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'], ['runlevel', '8', [], 'ENABLE_UTMP'], ['sd-bus-errors', '3', @@ -588,8 +588,8 @@ manpages = [ ['systemd-random-seed'], 'ENABLE_RANDOMSEED'], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], - ['systemd-resolve', '1', [], 'ENABLE_RESOLVED'], - ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVED'], + ['systemd-resolve', '1', [], 'ENABLE_RESOLVE'], + ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'], ['systemd-rfkill.service', '8', ['systemd-rfkill', 'systemd-rfkill.socket'], diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml index e3ef26bb81..47c90f2e48 100644 --- a/man/systemd-resolve.xml +++ b/man/systemd-resolve.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index f452806dd3..fd717e4963 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - + systemd-resolved.service diff --git a/meson.build b/meson.build index 47b54a980a..ea53ebec3a 100644 --- a/meson.build +++ b/meson.build @@ -1041,7 +1041,7 @@ foreach pair : [['utmp', 'ENABLE_UTMP'], ['environment-d', 'ENABLE_ENVIRONMENT_D'], ['binfmt', 'ENABLE_BINFMT'], ['coredump', 'ENABLE_COREDUMP'], - ['resolve', 'ENABLE_RESOLVED'], + ['resolve', 'ENABLE_RESOLVE'], ['logind', 'ENABLE_LOGIND'], ['hostnamed', 'ENABLE_HOSTNAMED'], ['localed', 'ENABLE_LOCALED'], @@ -1222,7 +1222,7 @@ test_dlopen = executable( foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'], ['systemd', 'ENABLE_NSS_SYSTEMD'], ['mymachines', 'ENABLE_MACHINED'], - ['resolve', 'ENABLE_RESOLVED']] + ['resolve', 'ENABLE_RESOLVE']] condition = tuple[1] == '' or conf.get(tuple[1]) == 1 if condition @@ -1405,7 +1405,7 @@ if conf.get('HAVE_BLKID') == 1 public_programs += [exe] endif -if conf.get('ENABLE_RESOLVED') == 1 +if conf.get('ENABLE_RESOLVE') == 1 executable('systemd-resolved', systemd_resolved_sources, gcrypt_util_sources, diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 1b25e26675..11238781c6 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -37,7 +37,7 @@ if bashcompletiondir != 'no' ['loginctl', 'ENABLE_LOGIND'], ['machinectl', 'ENABLE_MACHINED'], ['networkctl', 'ENABLE_NETWORKD'], - ['systemd-resolve', 'ENABLE_RESOLVED'], + ['systemd-resolve', 'ENABLE_RESOLVE'], ['timedatectl', 'ENABLE_TIMEDATED'], ] diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index a3a821e0b1..4e7b33a8a7 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -33,7 +33,7 @@ if zshcompletiondir != 'no' ['_machinectl', 'ENABLE_MACHINED'], ['_networkctl', 'ENABLE_NETWORKD'], ['_systemd-inhibit', 'ENABLE_LOGIND'], - ['_systemd-resolve', 'ENABLE_RESOLVED'], + ['_systemd-resolve', 'ENABLE_RESOLVE'], ['_systemd-tmpfiles', 'ENABLE_TMPFILES'], ['_timedatectl', 'ENABLE_TIMEDATED'], ] diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 935214d6a5..75e654e60d 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -123,7 +123,7 @@ systemd_resolve_sources = (basic_dns_sources + systemd_resolve_only_sources + dns_type_headers) -if conf.get('ENABLE_RESOLVED') == 1 +if conf.get('ENABLE_RESOLVE') == 1 install_data('org.freedesktop.resolve1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.resolve1.service', @@ -149,7 +149,7 @@ tests += [ [libgcrypt, libgpg_error, libm], - 'ENABLE_RESOLVED'], + 'ENABLE_RESOLVE'], [['src/resolve/test-dns-packet.c', basic_dns_sources, @@ -158,7 +158,7 @@ tests += [ [libgcrypt, libgpg_error, libm], - 'ENABLE_RESOLVED'], + 'ENABLE_RESOLVE'], [['src/resolve/test-resolved-packet.c', basic_dns_sources, @@ -167,7 +167,7 @@ tests += [ [libgcrypt, libgpg_error, libm], - 'ENABLE_RESOLVED'], + 'ENABLE_RESOLVE'], [['src/resolve/test-dnssec.c', basic_dns_sources, @@ -176,12 +176,12 @@ tests += [ [libgcrypt, libgpg_error, libm], - 'ENABLE_RESOLVED'], + 'ENABLE_RESOLVE'], [['src/resolve/test-dnssec-complex.c', 'src/resolve/dns-type.c', dns_type_headers], [], [], - 'ENABLE_RESOLVED', 'manual'], + 'ENABLE_RESOLVE', 'manual'], ] diff --git a/src/test/test-nss.c b/src/test/test-nss.c index 506bc3bd79..91beada5b2 100644 --- a/src/test/test-nss.c +++ b/src/test/test-nss.c @@ -453,7 +453,7 @@ static int parse_argv(int argc, char **argv, #if ENABLE_MYHOSTNAME "myhostname", #endif -#if ENABLE_RESOLVED +#if ENABLE_RESOLVE "resolve", #endif #if ENABLE_MACHINED diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4 index af97509c05..ef5a3cb619 100644 --- a/sysusers.d/systemd.conf.m4 +++ b/sysusers.d/systemd.conf.m4 @@ -9,7 +9,7 @@ g systemd-journal - - m4_ifdef(`ENABLE_NETWORKD', u systemd-network - "systemd Network Management" )m4_dnl -m4_ifdef(`ENABLE_RESOLVED', +m4_ifdef(`ENABLE_RESOLVE', u systemd-resolve - "systemd Resolver" )m4_dnl m4_ifdef(`ENABLE_TIMESYNCD', diff --git a/test/meson.build b/test/meson.build index 236dbb04c3..995a971778 100644 --- a/test/meson.build +++ b/test/meson.build @@ -133,7 +133,7 @@ test_data_files = ''' journal-data/journal-2.txt '''.split() -if conf.get('ENABLE_RESOLVED') == 1 +if conf.get('ENABLE_RESOLVE') == 1 test_data_files += ''' test-resolve/_openpgpkey.fedoraproject.org.pkts test-resolve/fedoraproject.org.pkts diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 index 064eae94f1..35e3809f57 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -13,7 +13,7 @@ L+ /etc/mtab - - - - ../proc/self/mounts m4_ifdef(`HAVE_SMACK_RUN_LABEL', t /etc/mtab - - - - security.SMACK64=_ )m4_dnl -m4_ifdef(`ENABLE_RESOLVED', +m4_ifdef(`ENABLE_RESOLVE', L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf )m4_dnl C /etc/nsswitch.conf - - - - diff --git a/units/meson.build b/units/meson.build index 9dbba98448..8494d23e9e 100644 --- a/units/meson.build +++ b/units/meson.build @@ -180,7 +180,7 @@ in_units = [ ['systemd-reboot.service', ''], ['systemd-remount-fs.service', '', 'local-fs.target.wants/'], - ['systemd-resolved.service', 'ENABLE_RESOLVED', + ['systemd-resolved.service', 'ENABLE_RESOLVE', join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['systemd-rfkill.service', 'ENABLE_RFKILL'],