Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k

[Peter Maydell]

On Thu, 3 Sep 2020 at 06:47, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
>   Hi,
>
> > Darn. I've added Gerd's patch since it is needed to fix the acceptance
> > tests in the Gitlab-CI. Could we maybe revert the patch that introduced
> > the regression instead, as long as no other proper fix is available? The
> > failing CI is really bugging me.
>
> Well, ddcf607fa3d6 fixes another nasty issue (builds modifying the
> source tree), so reverting that isn't really an option.
>
> We could have configure remove the symlink in case is present.  That way
> old build trees with the symlink already created should work too.  Right
> now only build trees created with ddcf607fa3d6 present are working
> properly.
>
> Untested patch below.
>
> take care,
>   Gerd
>
> diff --git a/configure b/configure
> index b1e11397a827..493b4e86da62 100755
> --- a/configure
> +++ b/configure
> @@ -8107,6 +8107,7 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by 
> relative path in .gdbinit
>  LINKS="$LINKS tests/acceptance tests/data"
>  LINKS="$LINKS tests/qemu-iotests/check"
>  LINKS="$LINKS python"
> +UNLINK="pc-bios/keymaps"
>  for bios_file in \
>      $source_path/pc-bios/*.bin \
>      $source_path/pc-bios/*.elf \
> @@ -8127,6 +8128,11 @@ for f in $LINKS ; do
>          symlink "$source_path/$f" "$f"
>      fi
>  done
> +for f in $UNLINK ; do
> +    if [ -L "$f" ]; then
> +        rm -f "$f"
> +    fi
> +done

If this is for back-compat with old trees only we should add a
comment that documents that in the final version of this patch.

thanks
-- PMM