From: Paolo Bonzini <pbonzini@redhat.com>
To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org
Cc: Thomas Huth <thuth@redhat.com>
Subject: Re: [PATCH kvm-unit-tests] Fix out-of-tree builds
Date: Tue, 23 Jun 2020 02:34:17 +0200 [thread overview]
Message-ID: <9ed1d7f8-9d3b-54a0-5c7d-e29856d12d79@redhat.com> (raw)
In-Reply-To: <20200511070641.23492-1-drjones@redhat.com>
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@redhat.com>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> 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
prev parent reply other threads:[~2020-06-23 0:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 7:06 [PATCH kvm-unit-tests] Fix out-of-tree builds Andrew Jones
2020-05-12 8:03 ` Thomas Huth
2020-06-23 0:34 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ed1d7f8-9d3b-54a0-5c7d-e29856d12d79@redhat.com \
--to=pbonzini@redhat.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).