SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: bump required minimum version to 0.62.0 (#36610)

Browse Source 
- bump the requred minimum version of meson to 0.62.0,
- use install_symlink(), which is supported since meson-0.61.0,
- use more features provided by newer meson with careful
conditionalization.

Follow-up for 8442ac9c02.
Closes #35967.
This commit is contained in:
Yu Watanabe
2025-03-10 07:51:28 +09:00
committed by GitHub
parent f06e6d19c0 51c086b9cc
commit 2792b1181f
25 changed files with 186 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_test.sh
-3
View File
@@ -135,9 +135,6 @@ $CC --version
meson --version
ninja --version
# TODO: drop once minimum meson version is bumped to 0.62 or newer
find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), install_tag : .*)/install_emptydir(\1)/g' '{}' '+'
for args in "${ARGS[@]}"; do
SECONDS=0
.github/workflows/unit_tests.sh
-2
View File
@@ -33,8 +33,6 @@ function info() {
}
function run_meson() {
# TODO: drop once minimum meson version is bumped to 0.62 or newer
find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), install_tag : .*)/install_emptydir(\1)/g' '{}' '+'
if ! meson "$@"; then
find . -type f -name meson-log.txt -exec cat '{}' +
return 1
README
+1 -1
View File
@@ -255,7 +255,7 @@ REQUIREMENTS:
python-pefile (optional, required for ukify)
python-lxml (optional, required to build the indices)
pyelftools (optional, required for systemd-boot)
meson >= 0.60.0
meson >= 0.62.0
ninja
gcc >= 8.4
>= 13.1.0 is required to build BPF program by using GCC
man/meson.build
+6 -2
View File
@@ -92,7 +92,9 @@ foreach tuple : manpages
output : htmlalias,
command : [ln, '-fs', html, '@OUTPUT@'])
if want_html
meson.add_install_script(sh, '-c', ln_s.format(docdir / 'html' / html, docdir / 'html' / htmlalias))
install_symlink(htmlalias,
pointing_to : html,
install_dir : docdir / 'html')
p2 += link
endif
html_pages += link
@@ -163,7 +165,9 @@ foreach tuple : xsltproc.found() ? [['systemd.directives', '7', systemd_directiv
output : htmlalias,
command : [ln, '-fs', html, '@OUTPUT@'])
if want_html
meson.add_install_script(sh, '-c', ln_s.format(docdir / 'html' / html, docdir / 'html' / htmlalias))
install_symlink(htmlalias,
pointing_to : html,
install_dir : docdir / 'html')
p2 += link
endif
html_pages += link
meson.build
+23 -10
View File
@@ -10,8 +10,8 @@ project('systemd', 'c',
'localstatedir=/var',
'warning_level=2',
],
meson_version : '>= 0.60.0',
)
meson_version : '>= 0.62.0',
)
project_major_version = meson.project_version().split('.')[0].split('~')[0]
if meson.project_version().contains('.')
@@ -127,6 +127,7 @@ datadir = prefixdir / get_option('datadir')
localstatedir = '/' / get_option('localstatedir')
libexecdir = prefixdir / 'lib/systemd'
libexecdir_to_bin = '../../bin/'
pkglibdir = libdir / 'systemd'
install_sysconfdir = get_option('install-sysconfdir') != 'false'
@@ -1244,18 +1245,30 @@ foreach ident : ['crypt_set_metadata_size',
endforeach
conf.set10('HAVE_LIBCRYPTSETUP', have)
# TODO: Use has_function(required : libcryptsetup_plugins) with meson >= 1.3.0
if libcryptsetup_plugins.allowed()
if meson.version().version_compare('>=1.3.0')
have = (cc.has_function(
'crypt_activate_by_token_pin',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup) and
dependencies : libcryptsetup,
required : libcryptsetup_plugins) and
cc.has_function(
'crypt_token_external_path',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup))
dependencies : libcryptsetup,
required : libcryptsetup_plugins))
else
have = false
if libcryptsetup_plugins.allowed()
have = (cc.has_function(
'crypt_activate_by_token_pin',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup) and
cc.has_function(
'crypt_token_external_path',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup))
else
have = false
endif
endif
conf.set10('HAVE_LIBCRYPTSETUP_PLUGINS', have)
@@ -2635,9 +2648,9 @@ if want_ukify
public_programs += ukify
# symlink for backwards compatibility after rename
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'ukify',
libexecdir / 'ukify'))
install_symlink('ukify',
pointing_to : libexecdir_to_bin / 'ukify',
install_dir : libexecdir)
endif
#####################################################################
profile.d/meson.build
+24 -6
View File
@@ -4,15 +4,33 @@ install_data('70-systemd-shell-extra.sh', install_dir : shellprofiledir.startswi
install_data('80-systemd-osc-context.sh', install_dir : shellprofiledir.startswith('/usr/') ? shellprofiledir : libexecdir / 'profile.d')
if conf.get('LINK_SHELL_EXTRA_DROPIN') == 1
install_emptydir(shellprofiledir)
if meson.version().version_compare('>=1.3.0')
install_symlink(
'70-systemd-shell-extra.sh',
pointing_to : fs.relative_to(libexecdir / 'profile.d' / '70-systemd-shell-extra.sh',
shellprofiledir),
install_dir : shellprofiledir)
else
install_emptydir(shellprofiledir)
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'profile.d' / '70-systemd-shell-extra.sh', shellprofiledir / '70-systemd-shell-extra.sh'))
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'profile.d' / '70-systemd-shell-extra.sh',
shellprofiledir / '70-systemd-shell-extra.sh'))
endif
endif
if conf.get('LINK_OSC_CONTEXT_DROPIN') == 1
install_emptydir(shellprofiledir)
if meson.version().version_compare('>=1.3.0')
install_symlink(
'80-systemd-osc-context.sh',
pointing_to : fs.relative_to(libexecdir / 'profile.d' / '80-systemd-osc-context.sh',
shellprofiledir),
install_dir : shellprofiledir)
else
install_emptydir(shellprofiledir)
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'profile.d' / '80-systemd-osc-context.sh', shellprofiledir / '80-systemd-osc-context.sh'))
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'profile.d' / '80-systemd-osc-context.sh',
shellprofiledir / '80-systemd-osc-context.sh'))
endif
endif
src/core/meson.build
+9 -5
View File
@@ -260,13 +260,17 @@ install_emptydir(usergeneratordir)
if install_sysconfdir
install_emptydir(pkgsysconfdir / 'system')
install_emptydir(pkgsysconfdir / 'user')
install_emptydir(sysconfdir / 'xdg/systemd')
meson.add_install_script(sh, '-c', ln_s.format(pkgsysconfdir / 'user',
sysconfdir / 'xdg/systemd/user'))
assert(sysconfdir / 'systemd' == pkgsysconfdir)
install_symlink('user',
pointing_to : '../../systemd/user',
install_dir : sysconfdir / 'xdg/systemd')
endif
install_emptydir(sbindir)
meson.add_install_script(sh, '-c', ln_s.format(libexecdir / 'systemd', sbindir / 'init'))
assert(fs.parent(sbindir) / 'lib/systemd' == libexecdir)
install_symlink('init',
pointing_to : '../lib/systemd/systemd',
install_dir : sbindir)
############################################################
src/cryptsetup/meson.build
+3 -3
View File
@@ -33,6 +33,6 @@ executables += [
]
# symlink for backwards compatibility after rename
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'systemd-cryptsetup',
libexecdir / 'systemd-cryptsetup'))
install_symlink('systemd-cryptsetup',
pointing_to : libexecdir_to_bin / 'systemd-cryptsetup',
install_dir : libexecdir)
src/dissect/meson.build
+3 -4
View File
@@ -12,7 +12,6 @@ executables += [
},
]
install_emptydir(sbindir)
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'systemd-dissect',
sbindir / 'mount.ddi'))
install_symlink('mount.ddi',
pointing_to : sbin_to_bin + 'systemd-dissect',
install_dir : sbindir)
src/environment-d-generator/meson.build
+3
View File
@@ -13,6 +13,9 @@ executables += [
]
install_emptydir(environmentdir)
# install_symlink() does not support broken symlink, and /etc/environment is not managed by us, thus
# may not exist. Hence, we need to create it by using the custom install script here.
# See https://github.com/mesonbuild/meson/pull/12266 .
meson.add_install_script(sh, '-c',
ln_s.format(sysconfdir / 'environment',
environmentdir / '99-environment.conf'))
src/fstab-generator/meson.build
+4 -3
View File
@@ -7,6 +7,7 @@ executables += [
},
]
meson.add_install_script(sh, '-c',
ln_s.format(systemgeneratordir / 'systemd-fstab-generator',
libexecdir / 'systemd-sysroot-fstab-check'))
assert(libexecdir / fs.name(systemgeneratordir) == systemgeneratordir)
install_symlink('systemd-sysroot-fstab-check',
pointing_to : fs.name(systemgeneratordir) / 'systemd-fstab-generator',
install_dir : libexecdir)
src/home/meson.build
+3 -3
View File
@@ -140,6 +140,6 @@ if install_sysconfdir_samples
install_dir : pkgconfigfiledir)
endif
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'homectl',
bindir / 'systemd-home-fallback-shell'))
install_symlink('systemd-home-fallback-shell',
pointing_to : 'homectl',
install_dir : bindir)
src/mount/meson.build
+3 -2
View File
@@ -9,5 +9,6 @@ executables += [
},
]
meson.add_install_script(sh, '-c', ln_s.format(bindir / 'systemd-mount',
bindir / 'systemd-umount'))
install_symlink('systemd-umount',
pointing_to : 'systemd-mount',
install_dir : bindir)
src/resolve/meson.build
+6 -7
View File
@@ -311,15 +311,14 @@ if conf.get('ENABLE_RESOLVE') == 1
install_data('resolv.conf',
install_dir : libexecdir)
install_emptydir(sbindir)
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'resolvectl',
sbindir / 'resolvconf'))
install_symlink('resolvconf',
pointing_to : sbin_to_bin + 'resolvectl',
install_dir : sbindir)
# symlink for backwards compatibility after rename
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'resolvectl',
bindir / 'systemd-resolve'))
install_symlink('systemd-resolve',
pointing_to : 'resolvectl',
install_dir : bindir)
endif
custom_target(
src/run/meson.build
+3 -5
View File
@@ -8,11 +8,9 @@ executables += [
},
]
install_emptydir(bindir)
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'systemd-run',
bindir / 'run0'))
install_symlink('run0',
pointing_to : 'systemd-run',
install_dir : bindir)
custom_target(
'systemd-run0',
src/ssh-generator/meson.build
+12 -3
View File
@@ -21,9 +21,18 @@ if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
install_dir : sshconfdir.startswith('/usr/') ? sshconfdir : libexecdir / 'ssh_config.d')
if conf.get('LINK_SSH_PROXY_DROPIN') == 1
install_emptydir(sshconfdir)
if meson.version().version_compare('>=1.3.0')
install_symlink(
'20-systemd-ssh-proxy.conf',
pointing_to : fs.relative_to(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf',
sshconfdir),
install_dir : sshconfdir)
else
install_emptydir(sshconfdir)
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf', sshconfdir / '20-systemd-ssh-proxy.conf'))
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf',
sshconfdir / '20-systemd-ssh-proxy.conf'))
endif
endif
endif
src/sysext/meson.build
+3 -2
View File
@@ -10,6 +10,7 @@ executables += [
]
if conf.get('ENABLE_SYSEXT') == 1
meson.add_install_script(sh, '-c', ln_s.format(bindir / 'systemd-sysext',
bindir / 'systemd-confext'))
install_symlink('systemd-confext',
pointing_to : 'systemd-sysext',
install_dir : bindir)
endif
src/systemctl/meson.build
+3 -4
View File
@@ -75,8 +75,7 @@ executables += [
foreach alias : (['halt', 'poweroff', 'reboot', 'shutdown'] +
(conf.get('HAVE_SYSV_COMPAT') == 1 ? ['runlevel', 'telinit'] : []))
install_emptydir(sbindir)
meson.add_install_script(sh, '-c',
ln_s.format(bindir / 'systemctl',
sbindir / alias))
install_symlink(alias,
pointing_to : sbin_to_bin + 'systemctl',
install_dir : sbindir)
endforeach
src/udev/meson.build
+4 -3
View File
@@ -269,9 +269,10 @@ executables += [
},
]
meson.add_install_script(sh, '-c', ln_s.format(bindir / 'udevadm',
libexecdir / 'systemd-udevd'),
install_tag : 'udev')
install_symlink('systemd-udevd',
pointing_to : libexecdir_to_bin + 'udevadm',
install_dir : libexecdir,
install_tag : 'udev')
if install_sysconfdir_samples
install_data('udev.conf',
src/userdb/meson.build
+12 -3
View File
@@ -34,9 +34,18 @@ if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
install_dir : sshdconfdir.startswith('/usr/') ? sshdconfdir : libexecdir / 'sshd_config.d')
if conf.get('LINK_SSHD_USERDB_DROPIN') == 1
install_emptydir(sshdconfdir)
if meson.version().version_compare('>=1.3.0')
install_symlink(
'20-systemd-userdb.conf',
pointing_to : fs.relative_to(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf',
sshdconfdir),
install_dir : sshdconfdir)
else
install_emptydir(sshdconfdir)
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf', sshdconfdir / '20-systemd-userdb.conf'))
meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf',
sshdconfdir / '20-systemd-userdb.conf'))
endif
endif
endif
test/fuzz/meson.build
+9 -6
View File
@@ -36,13 +36,16 @@ fuzz_regression_tests += { 'fuzz-unit-file' : dict }
############################################################
# TODO: Use native string formatting with meson >= 1.3.0
if get_option('auto_features').enabled()
sanitize_auto_features = 'enabled'
elif get_option('auto_features').disabled()
sanitize_auto_features = 'disabled'
if meson.version().version_compare('>=1.3.0')
sanitize_auto_features = '@0@'.format(get_option('auto_features'))
else
sanitize_auto_features = 'auto'
if get_option('auto_features').enabled()
sanitize_auto_features = 'enabled'
elif get_option('auto_features').disabled()
sanitize_auto_features = 'disabled'
else
sanitize_auto_features = 'auto'
endif
endif
fuzz_c_args = get_option('c_args')
test/meson.build
+11 -14
View File
@@ -474,27 +474,22 @@ if install_tests
foreach subdir : testdata_subdirs
# install_subdir() before meson 1.3.0 does not handle symlinks correctly (it follows them
# instead of copying the symlink) so we use rsync instead.
if meson.version().version_compare('<1.3.0')
if meson.version().version_compare('>=1.3.0')
install_subdir(subdir,
exclude_files : ['.gitattributes'],
install_dir : testdata_dir,
follow_symlinks : false)
else
if not rsync.found()
error('rsync is required to install the integration test data')
endif
rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes --exclude 25-default.link -- "@0@" "${DESTDIR:-}@1@"'
rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes -- "@0@" "${DESTDIR:-}@1@"'
meson.add_install_script(sh, '-c',
rsync_r.format(meson.current_source_dir() / subdir, testdata_dir))
else
install_subdir(subdir,
exclude_files : ['.gitattributes', '25-default.link'],
install_dir : testdata_dir,
follow_symlinks : false)
endif
endforeach
# test-network/conf/25-default.link is a local symlink that becomes dangling when installed, so we
# exclude it and create the correct symlink here.
meson.add_install_script(sh, '-c', ln_s.format(networkdir / '99-default.link',
testdata_dir / 'test-network/conf/25-default.link'))
install_data(kbd_model_map,
install_dir : testdata_dir + '/test-keymap-util')
@@ -511,6 +506,8 @@ if install_tests
# The unit tests implemented as shell scripts expect to find testdata/
# in the directory where they are stored.
meson.add_install_script(sh, '-c', ln_s.format(testdata_dir,
unittestsdir / 'testdata'))
assert(fs.parent(unittestsdir) / 'testdata' == testdata_dir)
install_symlink('testdata',
pointing_to : '../testdata',
install_dir : unittestsdir)
endif
test/test-network/conf/25-default.link
-1
View File
@@ -1 +0,0 @@
../../../network/99-default.link
test/test-network/conf/25-default.link
+11
View File
@@ -0,0 +1,11 @@
# SPDX-License-Identifier: MIT-0
#
# This is a copy of 99-default.link.
[Match]
OriginalName=*
[Link]
NamePolicy=keep kernel database onboard slot path
AlternativeNamesPolicy=database onboard slot path mac
MACAddressPolicy=persistent
units/meson.build
+22 -13
View File
@@ -922,16 +922,17 @@ foreach unit : units
if install
foreach target : unit.get('symlinks', [])
if target.endswith('/')
install_emptydir(systemunitdir / target, install_tag : unit.get('install_tag', ''))
meson.add_install_script(sh, '-c',
ln_s.format(systemunitdir / name,
systemunitdir / target / name),
install_tag : unit.get('install_tag', ''))
# '/' is only allowed at the end of the target
assert(target.replace('/', '') + '/' == target)
install_symlink(name,
pointing_to : '..' / name,
install_dir : systemunitdir / target,
install_tag : unit.get('install_tag', ''))
else
meson.add_install_script(sh, '-c',
ln_s.format(systemunitdir / name,
systemunitdir / target),
install_tag : unit.get('install_tag', ''))
install_symlink(target,
pointing_to : name,
install_dir : systemunitdir,
install_tag : unit.get('install_tag', ''))
endif
endforeach
endif
@@ -947,10 +948,18 @@ install_data('user@0.service.d/10-login-barrier.conf',
############################################################
install_emptydir(dbussessionservicedir)
meson.add_install_script(sh, '-c',
ln_s.format(dbussystemservicedir / 'org.freedesktop.systemd1.service',
dbussessionservicedir / 'org.freedesktop.systemd1.service'))
if meson.version().version_compare('>=1.3.0')
install_symlink(
'org.freedesktop.systemd1.service',
pointing_to : fs.relative_to(dbussystemservicedir / 'org.freedesktop.systemd1.service',
dbussessionservicedir),
install_dir : dbussessionservicedir)
else
install_emptydir(dbussessionservicedir)
meson.add_install_script(sh, '-c',
ln_s.format(dbussystemservicedir / 'org.freedesktop.systemd1.service',
dbussessionservicedir / 'org.freedesktop.systemd1.service'))
endif
if conf.get('HAVE_SYSV_COMPAT') == 1
foreach i : [1, 2, 3, 4, 5]
units/user/meson.build
+8 -7
View File
@@ -50,14 +50,15 @@ foreach unit : units
foreach target : unit.get('symlinks', [])
if target.endswith('/')
install_emptydir(userunitdir / target)
meson.add_install_script(sh, '-c',
ln_s.format(userunitdir / file,
userunitdir / target / file))
# '/' is only allowed at the end of the target
assert(target.replace('/', '') + '/' == target)
install_symlink(file,
pointing_to : '..' / file,
install_dir : userunitdir / target)
else
meson.add_install_script(sh, '-c',
ln_s.format(userunitdir / file,
userunitdir / target))
install_symlink(target,
pointing_to : file,
install_dir : userunitdir)
endif
endforeach
endif