system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

meson: call find_program() once and reuse the variable everywhere

Browse source 
Meson 0.58 has gotten quite bad with emitting a message every time
a quoted command is used:
Program /home/zbyszek/src/systemd-work/tools/meson-make-symlink.sh found: YES (/home/zbyszek/src/systemd-work/tools/meson-make-symlink.sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program xsltproc found: YES (/usr/bin/xsltproc)
Configuring custom-entities.ent using configuration
Message: Skipping bootctl.1 because ENABLE_EFI is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Message: Skipping journal-remote.conf.5 because HAVE_MICROHTTPD is false
Message: Skipping journal-upload.conf.5 because HAVE_MICROHTTPD is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Message: Skipping loader.conf.5 because ENABLE_EFI is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
...

Let's suffer one message only for each command. Hopefully we can silence
even this when https://github.com/mesonbuild/meson/issues/8642 is
resolved.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-05-14 14:16:17 +02:00
parent a2031de849
commit 0f4c4f3824
18 changed files with 80 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
catalog/meson.build
View file

@ -29,6 +29,5 @@ foreach file : in_files
install_dir : catalogdir) install_dir : catalogdir)
endforeach endforeach
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
'test -n "$DESTDIR" || @0@/journalctl --update-catalog' 'test -n "$DESTDIR" || @0@/journalctl --update-catalog'.format(rootbindir))
.format(rootbindir))

8
hwdb.d/meson.build
View file

@ -47,12 +47,10 @@ if conf.get('ENABLE_HWDB') == 1
install_dir : udevhwdbdir) install_dir : udevhwdbdir)
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
'test -n "$DESTDIR" || @0@/systemd-hwdb update' 'test -n "$DESTDIR" || @0@/systemd-hwdb update'.format(rootbindir))
.format(rootbindir))
endif endif
if want_tests != 'false' if want_tests != 'false'

9
man/meson.build
View file

@ -70,7 +70,7 @@ foreach tuple : xsltproc.found() ? manpages : []
link = custom_target( link = custom_target(
htmlalias, htmlalias,
output : htmlalias, output : htmlalias,
command : ['ln', '-fs', html, '@OUTPUT@']) command : [ln, '-fs', html, '@OUTPUT@'])
if want_html if want_html
dst = join_paths(docdir, 'html', htmlalias) dst = join_paths(docdir, 'html', htmlalias)
cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst) cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst)
@ -148,7 +148,7 @@ foreach tuple : xsltproc.found() ? [['systemd.directives', '7', systemd_directiv
htmlalias, htmlalias,
input : p2, input : p2,
output : htmlalias, output : htmlalias,
command : ['ln', '-fs', html, '@OUTPUT@']) command : [ln, '-fs', html, '@OUTPUT@'])
if want_html if want_html
dst = join_paths(docdir, 'html', htmlalias) dst = join_paths(docdir, 'html', htmlalias)
cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst) cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst)
@ -176,15 +176,14 @@ man = custom_target(
'man', 'man',
output : 'man', output : 'man',
depends : man_pages, depends : man_pages,
command : ['echo']) command : [echo])
html = custom_target( html = custom_target(
'html', 'html',
output : 'html', output : 'html',
depends : html_pages, depends : html_pages,
command : ['echo']) command : [echo])
rsync = find_program('rsync', required : false)
if rsync.found() if rsync.found()
run_target( run_target(
'doc-sync', 'doc-sync',

66
meson.build
View file

@ -600,17 +600,22 @@ endif
versiondep = declare_dependency(sources: version_h) versiondep = declare_dependency(sources: version_h)
sh = find_program('sh')
echo = find_program('echo')
test = find_program('test')
sed = find_program('sed') sed = find_program('sed')
awk = find_program('awk') awk = find_program('awk')
m4 = find_program('m4') m4 = find_program('m4')
stat = find_program('stat') stat = find_program('stat')
ln = find_program('ln')
git = find_program('git', required : false) git = find_program('git', required : false)
env = find_program('env') env = find_program('env')
perl = find_program('perl', required : false) perl = find_program('perl', required : false)
rsync = find_program('rsync', required : false)
meson_make_symlink = project_source_root + '/tools/meson-make-symlink.sh' meson_make_symlink = find_program('tools/meson-make-symlink.sh')
mkdir_p = 'mkdir -p $DESTDIR/@0@'
test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh') test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
mkdir_p = 'mkdir -p $DESTDIR/@0@'
splash_bmp = files('test/splash.bmp') splash_bmp = files('test/splash.bmp')
# if -Dxxx-path option is found, use that. Otherwise, check in $PATH, # if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
@ -644,7 +649,7 @@ endforeach
conf.set_quoted('TELINIT', get_option('telinit-path')) conf.set_quoted('TELINIT', get_option('telinit-path'))
if run_command('ln', '--relative', '--help').returncode() != 0 if run_command(ln, '--relative', '--help').returncode() != 0
error('ln does not support --relative (added in coreutils 8.16)') error('ln does not support --relative (added in coreutils 8.16)')
endif endif
@ -658,7 +663,7 @@ const char * in_word_set(const char *, @0@);
@1@ @1@
''' '''
gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
gperf_snippet = run_command('sh', '-c', gperf_snippet_format.format(gperf.path())) gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.path()))
gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
if cc.compiles(gperf_test) if cc.compiles(gperf_test)
gperf_len_type = 'size_t' gperf_len_type = 'size_t'
@ -718,11 +723,11 @@ conf.set_quoted('DEFAULT_NET_NAMING_SCHEME', default_net_naming_scheme)
time_epoch = get_option('time-epoch') time_epoch = get_option('time-epoch')
if time_epoch == -1 if time_epoch == -1
time_epoch = run_command('sh', ['-c', 'echo "$SOURCE_DATE_EPOCH"']).stdout().strip() time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"').stdout().strip()
if time_epoch == '' and git.found() and run_command('test', '-e', '.git').returncode() == 0 if time_epoch == '' and git.found() and run_command('test', '-e', '.git').returncode() == 0
# If we're in a git repository, use the creation time of the latest git tag. # If we're in a git repository, use the creation time of the latest git tag.
latest_tag = run_command('git', 'describe', '--abbrev=0', '--tags').stdout().strip() latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags').stdout().strip()
time_epoch = run_command('git', 'log', '--no-show-signature', '-1', '--format=%at', latest_tag).stdout() time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag).stdout()
endif endif
if time_epoch == '' if time_epoch == ''
NEWS = files('NEWS') NEWS = files('NEWS')
@ -1865,7 +1870,7 @@ foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'],
# We cannot use shared_module because it does not support version suffix. # We cannot use shared_module because it does not support version suffix.
# Unfortunately shared_library insists on creating the symlink… # Unfortunately shared_library insists on creating the symlink…
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
'rm $DESTDIR@0@/libnss_@1@.so' 'rm $DESTDIR@0@/libnss_@1@.so'
.format(rootlibdir, module)) .format(rootlibdir, module))
@ -2801,11 +2806,9 @@ if conf.get('ENABLE_BINFMT') == 1
install : true, install : true,
install_dir : rootlibexecdir) install_dir : rootlibexecdir)
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(binfmtdir))
mkdir_p.format(binfmtdir))
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
endif endif
endif endif
@ -3269,11 +3272,9 @@ if conf.get('HAVE_KMOD') == 1
install : true, install : true,
install_dir : rootlibexecdir) install_dir : rootlibexecdir)
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(modulesloaddir))
mkdir_p.format(modulesloaddir))
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
endif endif
endif endif
@ -3351,10 +3352,10 @@ executable(
custom_target( custom_target(
'systemd-runtest.env', 'systemd-runtest.env',
output : 'systemd-runtest.env', output : 'systemd-runtest.env',
command : ['sh', '-c', '{ ' + command : [sh, '-c',
'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) + '{ echo SYSTEMD_TEST_DATA=@0@; echo SYSTEMD_CATALOG_DIR=@1@; } >@OUTPUT@'.format(
'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) + join_paths(project_source_root, 'test'),
'} >@OUTPUT@'], join_paths(project_build_root, 'catalog'))],
build_by_default : true) build_by_default : true)
test_cflags = ['-DTEST_CODE=1'] test_cflags = ['-DTEST_CODE=1']
@ -3546,8 +3547,8 @@ install_data('LICENSE.GPL2',
'docs/GVARIANT-SERIALIZATION.md', 'docs/GVARIANT-SERIALIZATION.md',
install_dir : docdir) install_dir : docdir)
meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) meson.add_install_script(sh, '-c', mkdir_p.format(systemdstatedir))
meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) meson.add_install_script(sh, '-c', 'touch $DESTDIR@0@'.format(prefixdir))
############################################################ ############################################################
@ -3595,7 +3596,7 @@ foreach tuple : sanitizers
name, name,
output : name, output : name,
depends : build, depends : build,
command : [env, 'ln', '-fs', command : [ln, '-fs',
join_paths(build.full_path(), b), join_paths(build.full_path(), b),
'@OUTPUT@'], '@OUTPUT@'],
build_by_default : true) build_by_default : true)
@ -3622,9 +3623,8 @@ endforeach
if git.found() if git.found()
all_files = run_command( all_files = run_command(
'env', '-u', 'GIT_WORK_TREE', env, '-u', 'GIT_WORK_TREE',
git, git, '--git-dir=@0@/.git'.format(project_source_root),
'--git-dir=@0@/.git'.format(project_source_root),
'ls-files', ':/*.[ch]') 'ls-files', ':/*.[ch]')
all_files = files(all_files.stdout().split()) all_files = files(all_files.stdout().split())
@ -3648,16 +3648,16 @@ endif
if git.found() if git.found()
git_head = run_command( git_head = run_command(
git, git,
['--git-dir=@0@/.git'.format(project_source_root), '--git-dir=@0@/.git'.format(project_source_root),
'rev-parse', 'HEAD']).stdout().strip() 'rev-parse', 'HEAD').stdout().strip()
git_head_short = run_command( git_head_short = run_command(
git, git,
['--git-dir=@0@/.git'.format(project_source_root), '--git-dir=@0@/.git'.format(project_source_root),
'rev-parse', '--short=7', 'HEAD']).stdout().strip() 'rev-parse', '--short=7', 'HEAD').stdout().strip()
run_target( run_target(
'git-snapshot', 'git-snapshot',
command : ['git', 'archive', command : [git, 'archive',
'-o', '@0@/systemd-@1@.tar.gz'.format(project_source_root, '-o', '@0@/systemd-@1@.tar.gz'.format(project_source_root,
git_head_short), git_head_short),
'--prefix', 'systemd-@0@/'.format(git_head), '--prefix', 'systemd-@0@/'.format(git_head),
@ -3694,7 +3694,7 @@ endif
custom_target( custom_target(
'update-man-rules', 'update-man-rules',
output : 'update-man-rules', output : 'update-man-rules',
command : ['sh', '-c', command : [sh, '-c',
'cd @0@ && '.format(meson.build_root()) + 'cd @0@ && '.format(meson.build_root()) +
'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) + 'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) +
'mv t @0@/man/rules/meson.build'.format(meson.current_source_dir())], 'mv t @0@/man/rules/meson.build'.format(meson.current_source_dir())],

2
network/meson.build
View file

@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1
install_dir : networkdir) install_dir : networkdir)
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
endif endif
endif endif

9
src/boot/efi/meson.build
View file

@ -72,14 +72,14 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
if efi_libdir == '' if efi_libdir == ''
# New location first introduced with gnu-efi 3.0.11 # New location first introduced with gnu-efi 3.0.11
efi_libdir = join_paths('/usr/lib/gnuefi', EFI_MACHINE_TYPE_NAME) efi_libdir = join_paths('/usr/lib/gnuefi', EFI_MACHINE_TYPE_NAME)
cmd = run_command('test', '-e', efi_libdir) cmd = run_command(test, '-e', efi_libdir)
if cmd.returncode() != 0 if cmd.returncode() != 0
# Fall back to the old approach # Fall back to the old approach
cmd = run_command(efi_cc + ['-print-multi-os-directory']) cmd = run_command(efi_cc + ['-print-multi-os-directory'])
if cmd.returncode() == 0 if cmd.returncode() == 0
path = join_paths('/usr/lib', cmd.stdout().strip()) path = join_paths('/usr/lib', cmd.stdout().strip())
cmd = run_command('realpath', '-e', path) cmd = run_command(env, 'realpath', '-e', path)
if cmd.returncode() == 0 if cmd.returncode() == 0
efi_libdir = cmd.stdout().strip() efi_libdir = cmd.stdout().strip()
endif endif
@ -116,7 +116,8 @@ if have_gnu_efi
foreach sbatvar : sbatvars foreach sbatvar : sbatvars
value = get_option(sbatvar[0]) value = get_option(sbatvar[0])
if value == '' or value == 'auto' if value == '' or value == 'auto'
value = run_command('sh', '-c', 'if [ -e /etc/os-release ]; then . /etc/os-release; else . /usr/lib/os-release; fi; echo $' + sbatvar[1]).stdout().strip() cmd = 'if [ -e /etc/os-release ]; then . /etc/os-release; else . /usr/lib/os-release; fi; echo $@0@'.format(sbatvar[1])
value = run_command(sh, '-c', cmd).stdout().strip()
endif endif
if value == '' if value == ''
error('Required @0@ option not set and autodetection failed'.format(sbatvar[0])) error('Required @0@ option not set and autodetection failed'.format(sbatvar[0]))
@ -156,7 +157,7 @@ if have_gnu_efi
efi_lds = '' efi_lds = ''
foreach location : efi_location_map foreach location : efi_location_map
if efi_lds == '' if efi_lds == ''
cmd = run_command('test', '-f', location[0]) cmd = run_command(test, '-f', location[0])
if cmd.returncode() == 0 if cmd.returncode() == 0
efi_lds = location[0] efi_lds = location[0]
efi_crt0 = location[1] efi_crt0 = location[1]

14
src/core/meson.build
View file

@ -203,15 +203,15 @@ policy = configure_file(
install_data(policy, install_data(policy,
install_dir : polkitpolicydir) install_dir : polkitpolicydir)
meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir)) meson.add_install_script(sh, '-c', mkdir_p.format(systemshutdowndir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) meson.add_install_script(sh, '-c', mkdir_p.format(systemsleepdir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script(sh, '-c', mkdir_p.format(systemgeneratordir))
meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) meson.add_install_script(sh, '-c', mkdir_p.format(usergeneratordir))
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system'))) meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system')))
meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
endif endif
############################################################ ############################################################

4
src/journal-remote/meson.build
View file

@ -67,9 +67,9 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
install_dir : join_paths(pkgdatadir, 'gatewayd')) install_dir : join_paths(pkgdatadir, 'gatewayd'))
if get_option('create-log-dirs') if get_option('create-log-dirs')
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
mkdir_p.format('/var/log/journal/remote')) mkdir_p.format('/var/log/journal/remote'))
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
'''chown 0:0 $DESTDIR/var/log/journal/remote && '''chown 0:0 $DESTDIR/var/log/journal/remote &&
chmod 755 $DESTDIR/var/log/journal/remote || :''') chmod 755 $DESTDIR/var/log/journal/remote || :''')
endif endif

21
src/journal/meson.build
View file

@ -56,22 +56,17 @@ if install_sysconfdir_samples
endif endif
if get_option('create-log-dirs') if get_option('create-log-dirs')
meson.add_install_script( meson.add_install_script(sh, '-c', mkdir_p.format('/var/log/journal'))
'sh', '-c', meson.add_install_script(sh, '-c',
mkdir_p.format('/var/log/journal')) '''chown 0:0 $DESTDIR/var/log/journal &&
meson.add_install_script( chmod 755 $DESTDIR/var/log/journal || :''')
'sh', '-c',
'''chown 0:0 $DESTDIR/var/log/journal &&
chmod 755 $DESTDIR/var/log/journal || :''')
if get_option('adm-group') if get_option('adm-group')
meson.add_install_script( meson.add_install_script(sh, '-c',
'sh', '-c', 'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
endif endif
if get_option('wheel-group') if get_option('wheel-group')
meson.add_install_script( meson.add_install_script(sh, '-c',
'sh', '-c', 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
endif endif
endif endif

2
src/kernel-install/meson.build
View file

@ -14,7 +14,7 @@ if want_kernel_install
install_dir : kernelinstalldir) install_dir : kernelinstalldir)
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c',
mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
endif endif

2
src/locale/meson.build
View file

@ -20,7 +20,7 @@ endif
# If you know a way that allows the same variables to be used # If you know a way that allows the same variables to be used
# in sources list and concatenated to a string for test_env, # in sources list and concatenated to a string for test_env,
# let me know. # let me know.
kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map') kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map')
language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map') language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map')
if conf.get('ENABLE_LOCALED') == 1 if conf.get('ENABLE_LOCALED') == 1

2
src/test/meson.build
View file

@ -11,7 +11,7 @@ test_hashmap_ordered_c = custom_target(
test_include_dir = include_directories('.') test_include_dir = include_directories('.')
path = run_command('sh', ['-c', 'echo "$PATH"']).stdout().strip() path = run_command(sh, '-c', 'echo "$PATH"').stdout().strip()
test_env = environment() test_env = environment()
test_env.set('SYSTEMD_KBD_MODEL_MAP', kbd_model_map) test_env.set('SYSTEMD_KBD_MODEL_MAP', kbd_model_map)
test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)

3
src/udev/meson.build
View file

@ -165,8 +165,7 @@ configure_file(
install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
endif endif
fuzzers += [ fuzzers += [

3
sysctl.d/meson.build
View file

@ -28,6 +28,5 @@ foreach file : in_files
endforeach endforeach
if install_sysconfdir if install_sysconfdir
meson.add_install_script('sh', '-c', meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
endif endif

11
test/fuzz/meson.build
View file

@ -22,14 +22,11 @@ sanitize_address_undefined = custom_target(
sanitizers = [['address,undefined', sanitize_address_undefined]] sanitizers = [['address,undefined', sanitize_address_undefined]]
if git.found() if git.found()
out = run_command( out = run_command(env, '-u', 'GIT_WORK_TREE',
'env', '-u', 'GIT_WORK_TREE', git, '--git-dir=@0@/.git'.format(project_source_root),
git, 'ls-files', ':/test/fuzz/*/*')
'--git-dir=@0@/.git'.format(project_source_root),
'ls-files', ':/test/fuzz/*/*')
else else
out = run_command( out = run_command(sh, '-c', 'ls @0@/test/fuzz/*/*'.format(project_source_root))
'sh', '-c', 'ls @0@/test/fuzz/*/*'.format(project_source_root))
endif endif
fuzz_regression_tests = [] fuzz_regression_tests = []

7
test/meson.build
View file

@ -131,13 +131,12 @@ if want_tests != 'false' and dmi_arches.contains(host_machine.cpu_family())
if git.found() if git.found()
out = run_command( out = run_command(
'env', '-u', 'GIT_WORK_TREE', env, '-u', 'GIT_WORK_TREE',
git, git, '--git-dir=@0@/.git'.format(project_source_root),
'--git-dir=@0@/.git'.format(project_source_root),
'ls-files', ':/test/dmidecode-dumps/*.bin') 'ls-files', ':/test/dmidecode-dumps/*.bin')
else else
out = run_command( out = run_command(
'sh', '-c', 'ls @0@/test/dmidecode-dumps/*.bin'.format(project_source_root)) sh, '-c', 'ls @0@/test/dmidecode-dumps/*.bin'.format(project_source_root))
endif endif
foreach p : out.stdout().split() foreach p : out.stdout().split()

4
tmpfiles.d/meson.build
View file

@ -57,7 +57,5 @@ foreach file : m4_files
endforeach endforeach
if enable_tmpfiles and install_sysconfdir if enable_tmpfiles and install_sysconfdir
meson.add_install_script( meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
'sh', '-c',
mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
endif endif

5
units/meson.build
View file

@ -348,9 +348,8 @@ meson.add_install_script(meson_make_symlink,
if conf.get('HAVE_SYSV_COMPAT') == 1 if conf.get('HAVE_SYSV_COMPAT') == 1
foreach i : [1, 2, 3, 4, 5] foreach i : [1, 2, 3, 4, 5]
meson.add_install_script( meson.add_install_script(
'sh', '-c', sh, '-c',
mkdir_p mkdir_p.format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i))))
.format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i))))
endforeach endforeach
endif endif