configure: Use LINKS loop for all build tree symlinks
A few places in configure were doing ad-hoc calls to the symlink function to set up symlinks from the build tree back to the source tree. We have a loop that does this already for all files and directories listed in the LINKS environment variable; use that instead. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
e29e5c6ee0
commit
3995035395
14
configure
vendored
14
configure
vendored
@ -7417,6 +7417,8 @@ LINKS="$LINKS pc-bios/s390-ccw/Makefile"
|
|||||||
LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"
|
LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"
|
||||||
LINKS="$LINKS pc-bios/qemu-icon.bmp"
|
LINKS="$LINKS pc-bios/qemu-icon.bmp"
|
||||||
LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
|
LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
|
||||||
|
LINKS="$LINKS tests/acceptance tests/data"
|
||||||
|
LINKS="$LINKS tests/qemu-iotests/check"
|
||||||
for bios_file in \
|
for bios_file in \
|
||||||
$source_path/pc-bios/*.bin \
|
$source_path/pc-bios/*.bin \
|
||||||
$source_path/pc-bios/*.lid \
|
$source_path/pc-bios/*.lid \
|
||||||
@ -7453,25 +7455,13 @@ for rom in seabios vgabios ; do
|
|||||||
echo "RANLIB=$ranlib" >> $config_mak
|
echo "RANLIB=$ranlib" >> $config_mak
|
||||||
done
|
done
|
||||||
|
|
||||||
# set up tests data directory
|
|
||||||
for tests_subdir in acceptance data; do
|
|
||||||
if [ ! -e tests/$tests_subdir ]; then
|
|
||||||
symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# set up qemu-iotests in this build directory
|
# set up qemu-iotests in this build directory
|
||||||
iotests_common_env="tests/qemu-iotests/common.env"
|
iotests_common_env="tests/qemu-iotests/common.env"
|
||||||
iotests_check="tests/qemu-iotests/check"
|
|
||||||
|
|
||||||
echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
|
echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
|
||||||
echo >> "$iotests_common_env"
|
echo >> "$iotests_common_env"
|
||||||
echo "export PYTHON='$python'" >> "$iotests_common_env"
|
echo "export PYTHON='$python'" >> "$iotests_common_env"
|
||||||
|
|
||||||
if [ ! -e "$iotests_check" ]; then
|
|
||||||
symlink "$source_path/$iotests_check" "$iotests_check"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Save the configure command line for later reuse.
|
# Save the configure command line for later reuse.
|
||||||
cat <<EOD >config.status
|
cat <<EOD >config.status
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
Loading…
Reference in New Issue
Block a user