qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 658f2d: .gitlab-ci.d/container-cross: Fix RIS


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 658f2d: .gitlab-ci.d/container-cross: Fix RISC-V container...
Date: Wed, 01 Jun 2022 14:19:56 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 658f2da1f33aaf86d7b345891f479462a7d1e2d3
      
https://github.com/qemu/qemu/commit/658f2da1f33aaf86d7b345891f479462a7d1e2d3
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml

  Log Message:
  -----------
  .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages

The "riscv64-debian-cross-container" job does not depend on any other
container job from the first stage, so we can move it to the first
stage, too.

The "riscv64-debian-test-cross-container" job needs the debian11
container, so we should add a proper "needs:" statement here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220524093141.91012-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220527153603.887929-2-alex.bennee@linaro.org>


  Commit: 6fd4e75610c08820faabf9c544f2f2af2b1b8334
      
https://github.com/qemu/qemu/commit/6fd4e75610c08820faabf9c544f2f2af2b1b8334
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/crossbuilds.yml

  Log Message:
  -----------
  .gitlab-ci.d/crossbuilds: Fix the dependency of the cross-i386-tci job

The cross-i386-tci job uses the fedora-i386-cross image, so we should make sure
that the corresponding job that builds it (the i386-fedora-cross-container job)
has finished before we start the TCI job.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220524092600.89997-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-3-alex.bennee@linaro.org>


  Commit: 861dca3707a73cbe022cefe52f7224b28350316b
      
https://github.com/qemu/qemu/commit/861dca3707a73cbe022cefe52f7224b28350316b
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml

  Log Message:
  -----------
  gitlab-ci: add meson JUnit test result into report

This allows the gitlab UI to show the test results in different ways,
see doc:

  https://docs.gitlab.com/ee/ci/unit_test_reports.html#how-it-works

Previous we only reports avocado test results (.avocado_test_job_template),
with this change, the qemu/meson tests are also covered.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220525173411.612224-1-marcandre.lureau@redhat.com>
[AJB: expand the commit description]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-4-alex.bennee@linaro.org>


  Commit: 85b141ea6ae448b718d438d9cf0009d73116f8d1
      
https://github.com/qemu/qemu/commit/85b141ea6ae448b718d438d9cf0009d73116f8d1
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: fix summary display of test compilers

The recent refactoring of configure.sh dropped a number of variables
we relied on for printing out information. Make it simpler.

Fixes: eebf199c09 (tests/tcg: invoke Makefile.target directly from QEMU's 
makefile)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220527153603.887929-5-alex.bennee@linaro.org>


  Commit: 06885cf93556adc3fd67aad0c279a0deb400bb7d
      
https://github.com/qemu/qemu/commit/06885cf93556adc3fd67aad0c279a0deb400bb7d
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/lcitool: fix up indentation to correct style

3 space indentation snuck into the initial commit. Clean it up before
we let it get established. I've also:

  - removed unused os import
  - added double lines between functions
  - added some comments and grouped and sorted the generation stanzas

My lint tool is also recommending using f-strings but that requires
python 3.6.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-6-alex.bennee@linaro.org>


  Commit: 18ad049d90feede8affee797822fca41d1472b71
      
https://github.com/qemu/qemu/commit/18ad049d90feede8affee797822fca41d1472b71
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-armhf-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-armhf-cross with lcitool

Use lcitool to update debian-armhf-cross to a Debian 11 based system.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-7-alex.bennee@linaro.org>


  Commit: 94806241878e2f8908a04f82fe4086ce56690d80
      
https://github.com/qemu/qemu/commit/94806241878e2f8908a04f82fe4086ce56690d80
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-armel-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-armel-cross with lcitool

Use lcitool to update debian-armel-cross to a Debian 11 based system.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-8-alex.bennee@linaro.org>


  Commit: 432ae739c6ce6f31f74da62be34325890ded278b
      
https://github.com/qemu/qemu/commit/432ae739c6ce6f31f74da62be34325890ded278b
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-mipsel-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-mipsel-cross with lcitool

Use lcitool to update debian-mipsel-cross to a Debian 11 based system.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-9-alex.bennee@linaro.org>


  Commit: 1e834d1714e72579d595d5395a3bb35b12a05d09
      
https://github.com/qemu/qemu/commit/1e834d1714e72579d595d5395a3bb35b12a05d09
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-mips64el-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-mips64el-cross with lcitool

Use lcitool to update debian-mips64el-cross to a Debian 11 based system.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-10-alex.bennee@linaro.org>


  Commit: 4ec740e12da8a969f1ae3f9147dde9ce3a79a506
      
https://github.com/qemu/qemu/commit/4ec740e12da8a969f1ae3f9147dde9ce3a79a506
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-ppc64el-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-ppc64el-cross with lcitool

Use lcitool to update debian-ppc64el-cross to a Debian 11 based system.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-11-alex.bennee@linaro.org>


  Commit: 9e19fd7d4a569f5802ede460fe03fd2d4d0c295c
      
https://github.com/qemu/qemu/commit/9e19fd7d4a569f5802ede460fe03fd2d4d0c295c
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/containers.yml
    M tests/docker/dockerfiles/debian-amd64.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian-amd64 with lcitool

The one minor wrinkle we need to account for is the netmap support
still requires building from source. We also include cscope and GNU
global as they are used in one of the builds.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Luigi Rizzo <rizzo@iet.unipi.it>
Cc: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Cc: Vincenzo Maffione <v.maffione@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-12-alex.bennee@linaro.org>


  Commit: ea857a3b7976010a7fe7b59a89941964028f502a
      
https://github.com/qemu/qemu/commit/ea857a3b7976010a7fe7b59a89941964028f502a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M pc-bios/optionrom/Makefile

  Log Message:
  -----------
  configure: do not define or use the CPP variable

Just hardcode $(CC) -E, it should be enough.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-13-alex.bennee@linaro.org>


  Commit: 231ca96316f17d0af8c5e72cc2c496c68ee23ab6
      
https://github.com/qemu/qemu/commit/231ca96316f17d0af8c5e72cc2c496c68ee23ab6
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  build: clean up ninja invocation

Fix an incorrect "@@:" and move "-d keepdepfile" to the NINJAFLAGS variable.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-3-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-14-alex.bennee@linaro.org>


  Commit: 9b32ba53f36428abdecc79a0a047c2636af130d1
      
https://github.com/qemu/qemu/commit/9b32ba53f36428abdecc79a0a047c2636af130d1
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M Makefile
    M scripts/mtest2make.py

  Log Message:
  -----------
  build: add a more generic way to specify make->ninja dependencies

Let any make target specify ninja goals that needs to be built for it
(though selecting the goals is _not_ recursive on depending targets)
instead of having a custom mechanism only for "make check" and "make
bench".

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-4-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-15-alex.bennee@linaro.org>


  Commit: 95808875be96e17b885a9e4f050897c67e8b9aaf
      
https://github.com/qemu/qemu/commit/95808875be96e17b885a9e4f050897c67e8b9aaf
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M tests/Makefile.include

  Log Message:
  -----------
  build: do a full build before running TCG tests

TCG tests need both QEMU and firmware to be built, so do "ninja all" before
trying to run them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-5-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-16-alex.bennee@linaro.org>


  Commit: 45f1eecdd63f9e4fa93fef01dd826e7706ac6d7b
      
https://github.com/qemu/qemu/commit/45f1eecdd63f9e4fa93fef01dd826e7706ac6d7b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M pc-bios/meson.build

  Log Message:
  -----------
  configure, meson: move symlinking of ROMs to meson

This is useful because pc-bios/meson.build already has a list of all ROM
files, and thus does not need to use wildcards.  The problems with
wildcards are mentioned above the definition of the LINKS variable,
but then the recommendation is disattended.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-6-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-17-alex.bennee@linaro.org>


  Commit: 867998cf5680329a150cb6d51a15d6990be49c77
      
https://github.com/qemu/qemu/commit/867998cf5680329a150cb6d51a15d6990be49c77
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M tests/tcg/configure.sh

  Log Message:
  -----------
  tests/tcg: correct target CPU for sparc32

We do not want v8plus for pure sparc32, as the difference with the V8 ABI
are only meaningful on 64-bit CPUs suh as ultrasparc; supersparc is the
best CPU to use for 32-bit.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-7-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-18-alex.bennee@linaro.org>


  Commit: cd362defbbd09cbbc08b3bb465141542887b8cef
      
https://github.com/qemu/qemu/commit/cd362defbbd09cbbc08b3bb465141542887b8cef
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M tests/Makefile.include
    R tests/tcg/configure.sh

  Log Message:
  -----------
  tests/tcg: merge configure.sh back into main configure script

tests/tcg/configure.sh has a complicated story.

In the beginning its code ran as part of the creation of config-target.mak
files, and that is where it placed the information on the target compiler.
However, probing for the buildability of TCG tests required multiple
inclusions of config-target.mak in the _main_ Makefile (not in
Makefile.target, which took care of building the QEMU executables in
the pre-Meson era), which polluted the namespace.

Thus, it was moved to a separate directory.  It created small config-*.mak
files in $(BUILD_DIR)/tests/tcg.  Those were also included multiple
times, but at least they were small and manageable; this was also an
important step in disentangling the TCG tests from Makefile.target.

Since then, Meson has allowed the configure script to go on a diet.
A few compilation tests survive (mostly for sanitizers) but these days
it mostly takes care of command line parsing, looking for tools, and
setting up the environment for Meson to do its stuff.

It's time to extend configure with the capability to build for more
than just one target: not just tests, but also firmware.  As a first
step, integrate all the logic to find cross compilers in the configure
script, and move tests/tcg/configure.sh back there (though as a
separate loop, not integrated in the one that generates target
configurations for Meson).

tests/tcg is actually very close to being buildable as a standalone
project, so I actually expect the compiler tests to move back to
tests/tcg, as a "configure" script of sorts which would run at Make
time after the docker images are built.  The GCC tree has a similar idea
of doing only bare-bones tree-wide configuration and leaving the rest
for Make time.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-8-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-19-alex.bennee@linaro.org>


  Commit: 46af66edcb9c123069a941f495ba8b13f486851a
      
https://github.com/qemu/qemu/commit/46af66edcb9c123069a941f495ba8b13f486851a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add missing cross compiler fallbacks

The arm compiler can be used for armeb, and the sparc64 compiler
can be used for sparc.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-9-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-20-alex.bennee@linaro.org>


  Commit: 2ad60f6f8c12ca0acd8834fdd70e088361b8791f
      
https://github.com/qemu/qemu/commit/2ad60f6f8c12ca0acd8834fdd70e088361b8791f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: handle host compiler in probe_target_compiler

In preparation for handling more binaries than just cc, handle
the case of "probe_target_compiler $cpu" directly in the function,
setting the target_* variables based on the ones that are used to
build QEMU.  The clang check also needs to be moved after this
fallback.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-10-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-21-alex.bennee@linaro.org>


  Commit: 5adb43be79dd125f8bf7bce0fd4b0c4f03e0aa71
      
https://github.com/qemu/qemu/commit/5adb43be79dd125f8bf7bce0fd4b0c4f03e0aa71
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: introduce --cross-prefix-*=

Also in preparation for handling more binaries from the cross binutils,
support an option --cross-prefix-ARCH.  All cross_cc_* defaults are
replaced with cross_prefix_*; the cross_cc_* fallbacks are extended
to the cross-compilation prefix, but the compiler fallbacks remain
as well.  This way, for example, --cross-cc-arm=arm-linux-gnueabihf-clang
also applies to armeb binaries.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-11-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-22-alex.bennee@linaro.org>


  Commit: 87eb014c5e80039bf6bee4f05557f48827239cb4
      
https://github.com/qemu/qemu/commit/87eb014c5e80039bf6bee4f05557f48827239cb4
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: include more binutils in tests/tcg makefile

Firmware builds require paths to all the binutils; it is not enough to
use only cc, or even as/ld as in the case of tests/tcg/tricore.
Adjust the cross-compiler configurator to detect also ar, nm, objcopy,
ranlib and strip.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-12-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-23-alex.bennee@linaro.org>


  Commit: ad38884512a72206463a95a30451253946d4218b
      
https://github.com/qemu/qemu/commit/ad38884512a72206463a95a30451253946d4218b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: move symlink configuration earlier

Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory
exist at the time when we'll write out the compiler configuration
for them.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-13-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-24-alex.bennee@linaro.org>


  Commit: 9ffed42614585026834fd63cdf586b78b1f72c66
      
https://github.com/qemu/qemu/commit/9ffed42614585026834fd63cdf586b78b1f72c66
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/netboot.mak

  Log Message:
  -----------
  configure: enable cross-compilation of s390-ccw

While container-based cross compilers are not supported, this already makes
it possible to build s390-ccw on any machine that has s390x GCC and binutils
installed.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-14-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-25-alex.bennee@linaro.org>


  Commit: 33ab4787422b04a3f4c94bbded6b05021d08b27d
      
https://github.com/qemu/qemu/commit/33ab4787422b04a3f4c94bbded6b05021d08b27d
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M pc-bios/optionrom/Makefile

  Log Message:
  -----------
  configure: enable cross-compilation of optionrom

While container-based cross compilers are not supported, this already makes
it possible to build x86 optionroms on any machine that has an installation
of GCC and binutils for 32- or 64-bit x86.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-15-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-26-alex.bennee@linaro.org>


  Commit: d695918f7bd92604e561b6963e4ca9aef83f489b
      
https://github.com/qemu/qemu/commit/d695918f7bd92604e561b6963e4ca9aef83f489b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure
    M pc-bios/vof/Makefile

  Log Message:
  -----------
  configure: enable cross compilation of vof

While container-based cross compilers are not supported, this already
makes it possible to build vof on any machine that has an installation
of GCC and binutils for 32- or 64-bit PowerPC.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-16-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-27-alex.bennee@linaro.org>


  Commit: f21db42631ae1f3feaa3bf94edd9c06c24b4aeb6
      
https://github.com/qemu/qemu/commit/f21db42631ae1f3feaa3bf94edd9c06c24b4aeb6
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: remove unused variables from config-host.mak

The only compiler variable that is still needed is $(CC), for
contrib/plugins/Makefile.  All firmware builds have their own
config-host.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-17-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220527153603.887929-28-alex.bennee@linaro.org>


  Commit: 6a0e7ea7b87cfa684bbcebaebafaef14c29a8872
      
https://github.com/qemu/qemu/commit/6a0e7ea7b87cfa684bbcebaebafaef14c29a8872
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    A .gitlab-ci.d/base.yml
    M .gitlab-ci.d/qemu-project.yml
    M docs/devel/ci-jobs.rst.inc

  Log Message:
  -----------
  gitlab: introduce a common base job template

Currently job rules are spread across the various templates
and jobs, making it hard to understand exactly what runs in
what scenario. This leads to inconsistency in the rules and
increased maint burden.

The intent is that we introduce a common '.base_job_template'
which will have a general purpose 'rules:' block. No other
template or job should define 'rules:', but instead they must
rely on the inherited rules. To allow behaviour to be tweaked,
rules will be influenced by a number of variables with the
naming scheme 'QEMU_JOB_nnnn'.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220526110705.59952-2-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-29-alex.bennee@linaro.org>


  Commit: 00125414ba1b9d04dfec3af6fb75e39591b53892
      
https://github.com/qemu/qemu/commit/00125414ba1b9d04dfec3af6fb75e39591b53892
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/base.yml
    M .gitlab-ci.d/cirrus.yml
    M docs/devel/ci-jobs.rst.inc

  Log Message:
  -----------
  gitlab: convert Cirrus jobs to .base_job_template

This folds the Cirrus job rules into the base job
template, introducing two new variables

  - QEMU_JOB_CIRRUS - identifies the job as making
    use of Cirrus CI via cirrus-run

  - QEMU_JOB_OPTIONAL - identifies the job as one
    that is not run by default, primarily due to
    resource constraints. It can be manually invoked
    by users if they wish to validate that scenario.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220526110705.59952-3-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-30-alex.bennee@linaro.org>


  Commit: 16fee101d9011ea5dfd56a055d19df802e59eb29
      
https://github.com/qemu/qemu/commit/16fee101d9011ea5dfd56a055d19df802e59eb29
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/base.yml
    M .gitlab-ci.d/static_checks.yml
    M docs/devel/ci-jobs.rst.inc

  Log Message:
  -----------
  gitlab: convert static checks to .base_job_template

This folds the static checks into using the base job
template rules, introducing one new variable

 - QEMU_JOB_ONLY_FORKS - a job that should never run
   on an upstream pipeline. The information it reports
   is only applicable to contributors in a pre-submission
   scenario, not time of merge.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220526110705.59952-4-berrange@redhat.com>
[AJB: fix typo]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-31-alex.bennee@linaro.org>


  Commit: e312d1fdbbb3a53ee30ab84203344588154129f9
      
https://github.com/qemu/qemu/commit/e312d1fdbbb3a53ee30ab84203344588154129f9
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/base.yml
    M .gitlab-ci.d/buildtest-template.yml
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/container-cross.yml
    M .gitlab-ci.d/container-template.yml
    M .gitlab-ci.d/crossbuild-template.yml
    M .gitlab-ci.d/windows.yml
    M docs/devel/ci-jobs.rst.inc

  Log Message:
  -----------
  gitlab: convert build/container jobs to .base_job_template

This converts the main build and container jobs to use the
base job rules, defining the following new variables

 - QEMU_JOB_SKIPPED - jobs that are known to be currently
   broken and should not be run. Can still be manually
   launched if desired.

 - QEMU_JOB_AVOCADO - jobs that run the Avocado integration
   test harness.

 - QEMU_JOB_PUBLISH - jobs that publish content after the
   branch is merged upstream

As build-tools-and-docs runs on master we declare the requirement of
building amd64-debian-container optional as it should already exits
once we merge.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220526110705.59952-5-berrange@redhat.com>
[AJB: fix upstream typo, mention optional container req]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-32-alex.bennee@linaro.org>


  Commit: 28357dc525b4798cdef1101cbb459afcd7233280
      
https://github.com/qemu/qemu/commit/28357dc525b4798cdef1101cbb459afcd7233280
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M .gitlab-ci.d/base.yml
    M docs/devel/ci-jobs.rst.inc

  Log Message:
  -----------
  gitlab: don't run CI jobs in forks by default

To preserve CI shared runner credits we don't want to run
pipelines on every push.

This sets up the config so that pipelines are never created
for contributors by default. To override this the QEMU_CI
variable can be set to a non-zero value. If set to 1, the
pipeline will be created but all jobs will remain manually
started. The contributor can selectively run jobs that they
care about. If set to 2, the pipeline will be created and
all jobs will immediately start.

This behavior can be controlled using push variables

  git push -o ci.variable=QEMU_CI=1

To make this more convenient define an alias

   git config --local alias.push-ci "push -o ci.variable=QEMU_CI=1"
   git config --local alias.push-ci-now "push -o ci.variable=QEMU_CI=2"

Which lets you run

  git push-ci

to create the pipeline, or

  git push-ci-now

to create and run the pipeline

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220526110705.59952-6-berrange@redhat.com>
[AJB: fix typo, replicate alias tips in ci.rst]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220527153603.887929-33-alex.bennee@linaro.org>


  Commit: 7266ecce502c31387a3cbf83d7297bc9cf27b139
      
https://github.com/qemu/qemu/commit/7266ecce502c31387a3cbf83d7297bc9cf27b139
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    M docs/devel/ci-jobs.rst.inc
    M docs/devel/ci.rst
    M docs/devel/submitting-a-patch.rst
    M docs/devel/testing.rst

  Log Message:
  -----------
  docs/devel: clean-up the CI links in the docs

There where some broken links so fix those up with proper references
to the devel docs. I also did a little light copy-editing to reflect
the current state and broke up a paragraph to reduce the "wall of
text" effect.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220527153603.887929-34-alex.bennee@linaro.org>


  Commit: e2c2d575991cbccc39da81f1b54e78523a24ed11
      
https://github.com/qemu/qemu/commit/e2c2d575991cbccc39da81f1b54e78523a24ed11
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-06-01 (Wed, 01 Jun 2022)

  Changed paths:
    A .gitlab-ci.d/base.yml
    M .gitlab-ci.d/buildtest-template.yml
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/cirrus.yml
    M .gitlab-ci.d/container-cross.yml
    M .gitlab-ci.d/container-template.yml
    M .gitlab-ci.d/containers.yml
    M .gitlab-ci.d/crossbuild-template.yml
    M .gitlab-ci.d/crossbuilds.yml
    M .gitlab-ci.d/qemu-project.yml
    M .gitlab-ci.d/static_checks.yml
    M .gitlab-ci.d/windows.yml
    M Makefile
    M configure
    M docs/devel/ci-jobs.rst.inc
    M docs/devel/ci.rst
    M docs/devel/submitting-a-patch.rst
    M docs/devel/testing.rst
    M meson.build
    M pc-bios/meson.build
    M pc-bios/optionrom/Makefile
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/vof/Makefile
    M scripts/mtest2make.py
    M tests/Makefile.include
    M tests/docker/Makefile.include
    M tests/docker/dockerfiles/debian-amd64.docker
    M tests/docker/dockerfiles/debian-armel-cross.docker
    M tests/docker/dockerfiles/debian-armhf-cross.docker
    M tests/docker/dockerfiles/debian-mips64el-cross.docker
    M tests/docker/dockerfiles/debian-mipsel-cross.docker
    M tests/docker/dockerfiles/debian-ppc64el-cross.docker
    M tests/lcitool/refresh
    R tests/tcg/configure.sh

  Log Message:
  -----------
  Merge tag 'pull-testing-next-010622-3' of https://github.com/stsquad/qemu 
into staging

Various testing updates

  - fix some gitlab container dependencies
  - report meson test results via JUnit
  - fix meson display of enabled cross compilers
  - convert more cross build containers to lcitool and Debian 11
  - re-factor cross compiler detection
  - use test cross-compilers for building ROMs
  - disable CI runs by default (see docs)
  - fix some broken links in development documentation

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmKXqXYACgkQ+9DbCVqe
# KkTaogf+PpslFcqKzcT+CY2zkmen7+531fSHQ2oP6+lMPSuIDXi7jn/d/IXQ1gcI
# BfCvnAsictBzBqCPNhKYd8zxZwdzSYT3QtRWR4D86G26tyL5Zsuw+HrXuja/af7A
# RDULBl8HGKuZKY83QI1wTekjamfdFQeWn1t9051np5mPt0buPe4S3xELl0A/QGX+
# f3H9hqYeQ+tb11a5KXEsbWrQqKRCNrjFKI2iKyz5rZa73Go0ODjHrtTfBccBNJv4
# TBFxAW/XU+AUTI3vgtAsBIonEz7AcJyqlMffnx93GIttuChn5KRIIMPuz7Oztn89
# OFHtGajs3DSEWjfEg9xncCaL7EFasA==
# =9Iod
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 01 Jun 2022 11:01:26 AM PDT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-testing-next-010622-3' of https://github.com/stsquad/qemu: (33 
commits)
  docs/devel: clean-up the CI links in the docs
  gitlab: don't run CI jobs in forks by default
  gitlab: convert build/container jobs to .base_job_template
  gitlab: convert static checks to .base_job_template
  gitlab: convert Cirrus jobs to .base_job_template
  gitlab: introduce a common base job template
  configure: remove unused variables from config-host.mak
  configure: enable cross compilation of vof
  configure: enable cross-compilation of optionrom
  configure: enable cross-compilation of s390-ccw
  configure: move symlink configuration earlier
  configure: include more binutils in tests/tcg makefile
  configure: introduce --cross-prefix-*=
  configure: handle host compiler in probe_target_compiler
  configure: add missing cross compiler fallbacks
  tests/tcg: merge configure.sh back into main configure script
  tests/tcg: correct target CPU for sparc32
  configure, meson: move symlinking of ROMs to meson
  build: do a full build before running TCG tests
  build: add a more generic way to specify make->ninja dependencies
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/7077fcb9b68f...e2c2d575991c



reply via email to

[Prev in Thread] Current Thread [Next in Thread]