From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 31/33] gitlab-ci.d: Build with --enable-fdt=system by default
Date: Mon, 27 Feb 2023 12:36:19 +0100 [thread overview]
Message-ID: <20230227113621.58468-32-thuth@redhat.com> (raw)
In-Reply-To: <20230227113621.58468-1-thuth@redhat.com>
By using --enable-fdt=system we can make sure that the configure
script does not try to check out the "dtc" submodule. This should
help to safe some precious CI minutes in the long run.
While we're at it, also drop some now-redundant --enable-slirp
and --enable-capstone statements. These used to have the "=system"
suffix in the past, too, which has been dropped when the their
corresponding submodules had been removed. Since these features
are auto-enabled anyway now (since the containers have the right
libraries installed), we do not need the explicit --enable-...
statements anymore.
Message-Id: <20230207201447.566661-6-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 2 +-
.gitlab-ci.d/buildtest.yml | 9 +++------
.gitlab-ci.d/crossbuild-template.yml | 5 +++--
.gitlab-ci.d/crossbuilds.yml | 2 ++
.gitlab-ci.d/windows.yml | 7 +++++--
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml
index 4a922d9c33..cb96b55c3f 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -11,7 +11,7 @@
fi
- mkdir build
- cd build
- - ../configure --enable-werror --disable-docs
+ - ../configure --enable-werror --disable-docs --enable-fdt=system
${LD_JOBS:+--meson=git} ${TARGETS:+--target-list="$TARGETS"}
$CONFIGURE_ARGS ||
{ cat config.log meson-logs/meson-log.txt && exit 1; }
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 8697c61072..d903c42798 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -41,7 +41,7 @@ build-system-ubuntu:
job: amd64-ubuntu2004-container
variables:
IMAGE: ubuntu2004
- CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-capstone
+ CONFIGURE_ARGS: --enable-docs
TARGETS: alpha-softmmu cris-softmmu hppa-softmmu
microblazeel-softmmu mips64el-softmmu
MAKE_CHECK_ARGS: check-build
@@ -120,7 +120,6 @@ build-system-fedora:
variables:
IMAGE: fedora
CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs
- --enable-fdt=system --enable-slirp --enable-capstone
TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
MAKE_CHECK_ARGS: check-build
@@ -166,9 +165,8 @@ build-system-centos:
job: amd64-centos8-container
variables:
IMAGE: centos8
- CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system
+ CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-vfio-user-server
--enable-modules --enable-trace-backends=dtrace --enable-docs
- --enable-vfio-user-server
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
MAKE_CHECK_ARGS: check-build
@@ -201,7 +199,6 @@ build-system-opensuse:
job: amd64-opensuse-leap-container
variables:
IMAGE: opensuse-leap
- CONFIGURE_ARGS: --enable-fdt=system
TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu
MAKE_CHECK_ARGS: check-build
artifacts:
@@ -464,7 +461,7 @@ tsan-build:
variables:
IMAGE: ubuntu2004
CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10
- --enable-trace-backends=ust --enable-fdt=system --disable-slirp
+ --enable-trace-backends=ust --disable-slirp
TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user
MAKE_CHECK_ARGS: bench V=1
diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml
index 6d709628f1..d07989e3b0 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -6,8 +6,9 @@
script:
- mkdir build
- cd build
- - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
- --disable-user --target-list-exclude="arm-softmmu cris-softmmu
+ - ../configure --enable-werror --disable-docs --enable-fdt=system
+ --disable-user $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS
+ --target-list-exclude="arm-softmmu cris-softmmu
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 57637c5127..101416080c 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -175,6 +175,7 @@ cross-win32-system:
job: win32-fedora-cross-container
variables:
IMAGE: fedora-win32-cross
+ EXTRA_CONFIGURE_OPTS: --enable-fdt=internal
CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
microblazeel-softmmu mips64el-softmmu nios2-softmmu
artifacts:
@@ -187,6 +188,7 @@ cross-win64-system:
job: win64-fedora-cross-container
variables:
IMAGE: fedora-win64-cross
+ EXTRA_CONFIGURE_OPTS: --enable-fdt=internal
CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu
m68k-softmmu microblazeel-softmmu nios2-softmmu
or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index cf445b77f6..87235e43b4 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -38,6 +38,7 @@ msys2-64bit:
mingw-w64-x86_64-capstone
mingw-w64-x86_64-curl
mingw-w64-x86_64-cyrus-sasl
+ mingw-w64-x86_64-dtc
mingw-w64-x86_64-gcc
mingw-w64-x86_64-glib2
mingw-w64-x86_64-gnutls
@@ -71,7 +72,7 @@ msys2-64bit:
# for the msys2 64-bit job, due to the build could not complete within
# the project timeout.
- ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu
- --without-default-devices'
+ --without-default-devices --enable-fdt=system'
- ..\msys64\usr\bin\bash -lc 'make'
# qTests don't run successfully with "--without-default-devices",
# so let's exclude the qtests from CI for now.
@@ -86,6 +87,7 @@ msys2-32bit:
mingw-w64-i686-capstone
mingw-w64-i686-curl
mingw-w64-i686-cyrus-sasl
+ mingw-w64-i686-dtc
mingw-w64-i686-gcc
mingw-w64-i686-glib2
mingw-w64-i686-gnutls
@@ -113,7 +115,8 @@ msys2-32bit:
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
- mkdir output
- cd output
- - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu'
+ - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu
+ --enable-fdt=system'
- ..\msys64\usr\bin\bash -lc 'make'
- ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" ||
{ cat meson-logs/testlog.txt; exit 1; }'
--
2.31.1
next prev parent reply other threads:[~2023-02-27 11:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 11:35 [PULL 00/33] s390x and testing related patches Thomas Huth
2023-02-27 11:35 ` [PULL 01/33] tests/qtest/rtl8139-test: Make the test less verbose by default Thomas Huth
2023-02-27 11:35 ` [PULL 02/33] Do not include hw/hw.h if it is not necessary Thomas Huth
2023-02-27 11:35 ` [PULL 03/33] hw/vfio/ccw: Simplify using DEVICE() macro Thomas Huth
2023-02-27 11:35 ` [PULL 04/33] hw/vfio/ccw: Use intermediate S390CCWDevice variable Thomas Huth
2023-02-27 11:35 ` [PULL 05/33] hw/vfio/ccw: Replace DO_UPCAST(S390CCWDevice) by S390_CCW_DEVICE() Thomas Huth
2023-02-27 11:35 ` [PULL 06/33] hw/vfio/ccw: Remove pointless S390CCWDevice variable Thomas Huth
2023-02-27 11:35 ` [PULL 07/33] hw/vfio/ccw: Replace DO_UPCAST(VFIOCCWDevice) by VFIO_CCW() Thomas Huth
2023-02-27 11:35 ` [PULL 08/33] target/s390x/arch_dump: Fix memory corruption in s390x_write_elf64_notes() Thomas Huth
2023-02-27 11:35 ` [PULL 09/33] target/s390x/arch_dump: Simplify memory allocation " Thomas Huth
2023-02-27 11:35 ` [PULL 10/33] target/s390x: Fix s390_probe_access for user-only Thomas Huth
2023-02-27 11:35 ` [PULL 11/33] target/s390x: Pass S390Access pointer into access_prepare Thomas Huth
2023-02-27 11:36 ` [PULL 12/33] target/s390x: Use void* for haddr in S390Access Thomas Huth
2023-02-27 11:36 ` [PULL 13/33] target/s390x: Tidy access_prepare_nf Thomas Huth
2023-02-27 11:36 ` [PULL 14/33] target/s390x: Remove TLB_NOTDIRTY workarounds Thomas Huth
2023-02-27 11:36 ` [PULL 15/33] target/s390x: Inline do_access_{get,set}_byte Thomas Huth
2023-02-27 11:36 ` [PULL 16/33] target/s390x: Hoist some computation in access_memmove Thomas Huth
2023-02-27 11:36 ` [PULL 17/33] s390x/pv: Add support for asynchronous teardown for reboot Thomas Huth
2023-02-27 11:36 ` [PULL 18/33] target/s390x: Use tcg_constant_* in local contexts Thomas Huth
2023-02-27 11:36 ` [PULL 19/33] target/s390x: Use tcg_constant_* for DisasCompare Thomas Huth
2023-02-27 11:36 ` [PULL 20/33] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34 Thomas Huth
2023-02-27 11:36 ` [PULL 21/33] target/s390x: Use tcg_constant_* in translate_vx.c.inc Thomas Huth
2023-02-27 11:36 ` [PULL 22/33] tests/tcg/s390x: Add bal.S Thomas Huth
2023-02-27 11:36 ` [PULL 23/33] tests/tcg/s390x: Add sam.S Thomas Huth
2023-02-27 11:36 ` [PULL 24/33] configure: Add 'mkdir build' check Thomas Huth
2023-02-27 11:36 ` [PULL 25/33] qemu-keymap: Silence memory leak warning from Clang's sanitizer Thomas Huth
2023-02-27 11:36 ` [PULL 26/33] meson: fix dependency on qemu-keymap Thomas Huth
2023-02-27 11:36 ` [PULL 27/33] Updated the FSF address to <https://www.gnu.org/licenses/> Thomas Huth
2023-02-27 11:36 ` [PULL 28/33] gitlab-ci.d/buildtest: Remove aarch64-softmmu from the build-system-ubuntu job Thomas Huth
2023-02-27 11:36 ` [PULL 29/33] gitlab-ci.d/buildtest: Disintegrate the build-coroutine-sigaltstack job Thomas Huth
2023-02-27 11:36 ` [PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step Thomas Huth
2023-02-27 11:36 ` Thomas Huth [this message]
2023-02-27 11:36 ` [PULL 32/33] gitlab-ci.d/base: Mark jobs as interruptible by default Thomas Huth
2023-02-27 11:36 ` [PULL 33/33] Deprecate the "-no-acpi" command line switch Thomas Huth
2023-02-27 14:45 ` [PULL 00/33] s390x and testing related patches Peter Maydell
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=20230227113621.58468-32-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).