morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

meson fixlets (#38086)

Browse Source 
Some fixes for issues found while doing a minimal aarch64 cross build
This commit is contained in:
Yu Watanabe
2025-07-06 16:27:31 +09:00
committed by GitHub
parent f89a52e360 163e666204
commit e7f04514c1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/meson.build
View File

@@ -12,7 +12,9 @@ generated_sources += test_hashmap_ordered_c
path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip()
test_env = environment()
test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
if conf.get('ENABLE_LOCALED') == 1
test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
endif
test_env.set('PATH', meson.project_build_root() + ':' + path)
test_env.set('PROJECT_BUILD_ROOT', meson.project_build_root())
test_env.set('SYSTEMD_SLOW_TESTS', want_slow_tests ? '1' : '0')

5
test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
View File

@@ -7,7 +7,10 @@ udev_storage_test_template = {
}
qemu = find_program('qemu-system-@0@'.format(host_machine.cpu_family()), 'qemu-kvm', dirs : ['/usr/libexec'], native : true, required : false)
if qemu.found()
if qemu.found() and host_machine.cpu_family() == 'aarch64'
# qemu-system-aarch64 errors out if no machine is specified
devices = run_command(qemu, '-device', 'help', '-machine', 'virt', check : true).stdout().strip()
elif qemu.found()
devices = run_command(qemu, '-device', 'help', check : true).stdout().strip()
else
devices = ''