diff options
| author | Andrew Jones <drjones@redhat.com> | 2020-05-11 09:06:41 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2020-06-16 15:00:07 +0200 |
| commit | 75a7ac3089e07511231d3fd7b612cd9e243edd7b (patch) | |
| tree | 353534a4cfaacbfa62425d608977a6ae4c1af54c | |
| parent | 4b74c718c57d1697e3228e2c699b0fe9c1d24e97 (diff) | |
| download | kvm-unit-tests-75a7ac3089e07511231d3fd7b612cd9e243edd7b.tar.gz | |
Fix out-of-tree builds
Since b16df9ee5f3b out-of-tree builds have been broken because we
started validating the newly user-configurable $erratatxt file
before linking it into the build dir. We fix this not by moving
the validation, but by removing the linking and instead using the
full path of the $erratatxt file. This allows one to keep that file
separate from the src and build dirs.
Fixes: b16df9ee5f3b ("arch-run: Add reserved variables to the default environ")
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Message-Id: <20200511070641.23492-1-drjones@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rwxr-xr-x | configure | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -17,7 +17,7 @@ environ_default=yes u32_long= vmm="qemu" errata_force=0 -erratatxt="errata.txt" +erratatxt="$srcdir/errata.txt" usage() { cat <<-EOF @@ -89,7 +89,8 @@ while [[ "$1" = -* ]]; do environ_default=no ;; --erratatxt) - erratatxt="$arg" + erratatxt= + [ "$arg" ] && erratatxt=$(eval realpath "$arg") ;; --help) usage @@ -169,9 +170,6 @@ if test ! -e Makefile; then echo "linking scripts..." ln -sf "$srcdir/scripts" - - echo "linking errata.txt..." - ln -sf "$srcdir/errata.txt" fi # link lib/asm for the architecture |