[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 for-3.1 4/4] configure: Use LINKS loop for all bu
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 for-3.1 4/4] configure: Use LINKS loop for all build tree symlinks |
Date: |
Fri, 2 Nov 2018 11:52:39 +0000 |
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 <address@hidden>
---
configure | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 52408ed3076..74e313a8101 100755
--- a/configure
+++ b/configure
@@ -7417,6 +7417,8 @@ LINKS="$LINKS pc-bios/s390-ccw/Makefile"
LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"
LINKS="$LINKS pc-bios/qemu-icon.bmp"
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 \
$source_path/pc-bios/*.bin \
$source_path/pc-bios/*.lid \
@@ -7453,25 +7455,13 @@ for rom in seabios vgabios ; do
echo "RANLIB=$ranlib" >> $config_mak
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
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 >> "$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.
cat <<EOD >config.status
#!/bin/sh
--
2.19.1
- [Qemu-devel] [PATCH v2 for-3.1 0/4] configure: symlink directories, not wildcarded files, Peter Maydell, 2018/11/02
- [Qemu-devel] [PATCH v2 for-3.1 3/4] configure: Rename FILES variable to LINKS, Peter Maydell, 2018/11/02
- [Qemu-devel] [PATCH v2 for-3.1 2/4] tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/, Peter Maydell, 2018/11/02
- Re: [Qemu-devel] [PATCH v2 for-3.1 0/4] configure: symlink directories, not wildcarded files, Philippe Mathieu-Daudé, 2018/11/02