From: Yu Watanabe Date: Thu, 14 Aug 2025 12:48:43 +0000 (+0900) Subject: meson: realign summary X-Git-Tag: v259-rc1~541^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f56c036fd3f2c0ea03f4cd4e9921cb807f045aaf;p=thirdparty%2Fsystemd.git meson: realign summary --- diff --git a/meson.build b/meson.build index d63ee1e2d93..2e76d44aeb2 100644 --- a/meson.build +++ b/meson.build @@ -2959,64 +2959,64 @@ alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch check : true).stdout().strip() summary({ - 'split bin-sbin' : split_bin, - 'prefix directory' : prefixdir, - 'sysconf directory' : sysconfdir, - 'include directory' : includedir, - 'lib directory' : libdir, - 'SysV init scripts' : sysvinit_path, - 'SysV rc?.d directories' : sysvrcnd_path, - 'SysV rc.local script' : sysvrclocal_path, - 'PAM modules directory' : pamlibdir, - 'PAM configuration directory' : pamconfdir, - 'ssh server configuration directory' : sshdconfdir, + 'split bin-sbin' : split_bin, + 'prefix directory' : prefixdir, + 'sysconf directory' : sysconfdir, + 'include directory' : includedir, + 'lib directory' : libdir, + 'SysV init scripts' : sysvinit_path, + 'SysV rc?.d directories' : sysvrcnd_path, + 'SysV rc.local script' : sysvrclocal_path, + 'PAM modules directory' : pamlibdir, + 'PAM configuration directory' : pamconfdir, + 'ssh server configuration directory' : sshdconfdir, 'ssh server privilege separation directory' : sshdprivsepdir, - 'ssh client configuration directory' : sshconfdir, - 'libcryptsetup plugins directory' : libcryptsetup_plugins_dir, - 'Shell profile directory' : shellprofiledir, - 'RPM macros directory' : rpmmacrosdir, - 'modprobe.d directory' : modprobedir, - 'D-Bus policy directory' : dbuspolicydir, - 'D-Bus session directory' : dbussessionservicedir, - 'D-Bus system directory' : dbussystemservicedir, - 'D-Bus interfaces directory' : dbus_interfaces_dir, - 'bash completions directory' : bashcompletiondir, - 'zsh completions directory' : zshcompletiondir, - 'private shared lib version tag' : shared_lib_tag, - 'debug shell' : '@0@ @ @1@'.format(get_option('debug-shell'), - get_option('debug-tty')), - 'system UIDs' : '<=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_UID_MAX'), - conf.get('SYSTEM_ALLOC_UID_MIN')), - 'system GIDs' : '<=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_GID_MAX'), - conf.get('SYSTEM_ALLOC_GID_MIN')), - 'greeter UIDs' : '@0@…@1@'.format(greeter_uid_min, greeter_uid_max), - 'dynamic UIDs' : '@0@…@1@'.format(dynamic_uid_min, dynamic_uid_max), - 'container UID bases' : '@0@…@1@'.format(container_uid_base_min, container_uid_base_max), - 'foreign UID base' : '@0@'.format(foreign_uid_base), - 'static UID/GID allocations' : ' '.join(static_ugids), - '/dev/kvm access mode' : get_option('dev-kvm-mode'), - 'render group access mode' : get_option('group-render-mode'), - 'certificate root directory' : get_option('certificate-root'), - 'support URL' : support_url, - 'nobody user name' : nobody_user, - 'nobody group name' : nobody_group, - 'fallback hostname' : get_option('fallback-hostname'), - 'default compression method' : compression, - 'default DNSSEC mode' : default_dnssec, - 'default DNS-over-TLS mode' : default_dns_over_tls, - 'default mDNS mode' : default_mdns, - 'default LLMNR mode' : default_llmnr, - 'default DNS servers' : dns_servers.split(' '), - 'default NTP servers' : ntp_servers.split(' '), - 'default net.naming_scheme= value': default_net_naming_scheme, - 'default KillUserProcesses= value': kill_user_processes, - 'default locale' : default_locale, - 'default nspawn locale' : nspawn_locale, - 'default status unit format' : status_unit_format_default, - 'default user $PATH' : - default_user_path != '' ? default_user_path : '(same as system services)', - 'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog, - 'time epoch' : '@0@ (@1@)'.format(time_epoch, alt_time_epoch)}) + 'ssh client configuration directory' : sshconfdir, + 'libcryptsetup plugins directory' : libcryptsetup_plugins_dir, + 'Shell profile directory' : shellprofiledir, + 'RPM macros directory' : rpmmacrosdir, + 'modprobe.d directory' : modprobedir, + 'D-Bus policy directory' : dbuspolicydir, + 'D-Bus session directory' : dbussessionservicedir, + 'D-Bus system directory' : dbussystemservicedir, + 'D-Bus interfaces directory' : dbus_interfaces_dir, + 'bash completions directory' : bashcompletiondir, + 'zsh completions directory' : zshcompletiondir, + 'private shared lib version tag' : shared_lib_tag, + 'debug shell' : '@0@ @ @1@'.format(get_option('debug-shell'), + get_option('debug-tty')), + 'system UIDs' : '<=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_UID_MAX'), + conf.get('SYSTEM_ALLOC_UID_MIN')), + 'system GIDs' : '<=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_GID_MAX'), + conf.get('SYSTEM_ALLOC_GID_MIN')), + 'greeter UIDs' : '@0@…@1@'.format(greeter_uid_min, greeter_uid_max), + 'dynamic UIDs' : '@0@…@1@'.format(dynamic_uid_min, dynamic_uid_max), + 'container UID bases' : '@0@…@1@'.format(container_uid_base_min, container_uid_base_max), + 'foreign UID base' : '@0@'.format(foreign_uid_base), + 'static UID/GID allocations' : ' '.join(static_ugids), + '/dev/kvm access mode' : get_option('dev-kvm-mode'), + 'render group access mode' : get_option('group-render-mode'), + 'certificate root directory' : get_option('certificate-root'), + 'support URL' : support_url, + 'nobody user name' : nobody_user, + 'nobody group name' : nobody_group, + 'fallback hostname' : get_option('fallback-hostname'), + 'default compression method' : compression, + 'default DNSSEC mode' : default_dnssec, + 'default DNS-over-TLS mode' : default_dns_over_tls, + 'default mDNS mode' : default_mdns, + 'default LLMNR mode' : default_llmnr, + 'default DNS servers' : dns_servers.split(' '), + 'default NTP servers' : ntp_servers.split(' '), + 'default net.naming_scheme= value' : default_net_naming_scheme, + 'default KillUserProcesses= value' : kill_user_processes, + 'default locale' : default_locale, + 'default nspawn locale' : nspawn_locale, + 'default status unit format' : status_unit_format_default, + 'default user $PATH' : default_user_path != '' ? default_user_path : '(same as system services)', + 'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog, + 'time epoch' : '@0@ (@1@)'.format(time_epoch, alt_time_epoch) +}) # TODO: # CFLAGS: ${OUR_CFLAGS} ${CFLAGS} @@ -3185,6 +3185,7 @@ else endif summary({ - 'enabled' : ', '.join(found), - 'disabled' : ', '.join(missing)}, + 'enabled' : ', '.join(found), + 'disabled' : ', '.join(missing) + }, section : 'Features') diff --git a/src/boot/meson.build b/src/boot/meson.build index ba0b309acff..f29a16ccab8 100644 --- a/src/boot/meson.build +++ b/src/boot/meson.build @@ -132,16 +132,19 @@ elif get_option('sbat-distro') != '' endif endif -summary({'UEFI architectures' : efi_arch + (efi_arch_alt == '' ? '' : ', ' + efi_arch_alt)}, +summary({ + 'UEFI architectures' : efi_arch + (efi_arch_alt == '' ? '' : ', ' + efi_arch_alt) + }, section : 'UEFI') if efi_conf.get('SBAT_DISTRO', '') != '' summary({ - 'SBAT distro': efi_conf.get('SBAT_DISTRO'), - 'SBAT distro generation': efi_conf.get('SBAT_DISTRO_GENERATION'), - 'SBAT distro version': efi_conf.get('SBAT_DISTRO_VERSION'), - 'SBAT distro summary': efi_conf.get('SBAT_DISTRO_SUMMARY'), - 'SBAT distro URL': efi_conf.get('SBAT_DISTRO_URL')}, + 'SBAT distro' : efi_conf.get('SBAT_DISTRO'), + 'SBAT distro generation' : efi_conf.get('SBAT_DISTRO_GENERATION'), + 'SBAT distro version' : efi_conf.get('SBAT_DISTRO_VERSION'), + 'SBAT distro summary' : efi_conf.get('SBAT_DISTRO_SUMMARY'), + 'SBAT distro URL' : efi_conf.get('SBAT_DISTRO_URL') + }, section : 'UEFI') endif