On 11/05/20 09:06, Andrew Jones wrote:
> 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@xxxxxxxxxx>
> Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
> ---
> configure | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index 5d2cd90cd180..f9d030fd2f03 100755
> --- a/configure
> +++ b/configure
> @@ -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
>
Pushed, thanks.
Paolo
