OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure, meson: move symlinking of ROMs to meson 

This is useful because pc-bios/meson.build already has a list of all ROM
files, and thus does not need to use wildcards.  The problems with
wildcards are mentioned above the definition of the LINKS variable,
but then the recommendation is disattended.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-6-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-17-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-05-27 16:35:46 +01:00 committed by Alex Bennée
parent 95808875be
commit 45f1eecdd6
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -2100,21 +2100,6 @@ LINKS="$LINKS tests/avocado tests/data"
LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python" LINKS="$LINKS python"
LINKS="$LINKS contrib/plugins/Makefile " LINKS="$LINKS contrib/plugins/Makefile "
for bios_file in \
$source_path/pc-bios/*.bin \
$source_path/pc-bios/*.elf \
$source_path/pc-bios/*.lid \
$source_path/pc-bios/*.rom \
$source_path/pc-bios/*.dtb \
$source_path/pc-bios/*.img \
$source_path/pc-bios/openbios-* \
$source_path/pc-bios/u-boot.* \
$source_path/pc-bios/palcode-* \
$source_path/pc-bios/qemu_vga.ndrv
do
LINKS="$LINKS pc-bios/$(basename $bios_file)"
done
for f in $LINKS ; do for f in $LINKS ; do
if [ -e "$source_path/$f" ]; then if [ -e "$source_path/$f" ]; then
mkdir -p `dirname ./$f` mkdir -p `dirname ./$f`

17
pc-bios/meson.build
View File

@ -23,7 +23,7 @@ if unpack_edk2_blobs
endforeach endforeach
endif endif
blobs = files( blobs = [
'bios.bin', 'bios.bin',
'bios-256k.bin', 'bios-256k.bin',
'bios-microvm.bin', 'bios-microvm.bin',
@ -83,11 +83,18 @@ blobs = files(
'npcm7xx_bootrom.bin', 'npcm7xx_bootrom.bin',
'vof.bin', 'vof.bin',
'vof-nvram.bin', 'vof-nvram.bin',
) ]
if get_option('install_blobs') ln_s = [find_program('ln', required: true), '-sf']
install_data(blobs, install_dir: qemu_datadir) foreach f : blobs
endif roms += custom_target(f,
build_by_default: have_system,
output: f,
input: files('meson.build'), # dummy input
install: get_option('install_blobs'),
install_dir: qemu_datadir,
command: [ ln_s, meson.project_source_root() / 'pc-bios' / f, '@OUTPUT@' ])
endforeach
subdir('descriptors') subdir('descriptors')
subdir('keymaps') subdir('keymaps')