meson: update .gitlab-ci.yml file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Neal Gompa <ngompa13@gmail.com>
2024-10-01 20:05:46 +00:00 · 2020-08-03 08:53:00 +02:00 · 2020-08-03 08:53:00 +02:00 · 4be700fed9
commit 4be700fed9
parent cf566866ba
29 changed files with 325 additions and 67 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,7 +7,6 @@ stages:
  - sanity_checks

 .script_variables: &script_variables |
-  export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
  export CCACHE_BASEDIR="$(pwd)"
  export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
  export CCACHE_MAXSIZE="500M"
@ -51,10 +50,25 @@ stages:
  before_script:
    - *script_variables
  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE distcheck
+    - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build dist
+
+# Default native build job only for CentOS 7 that is always run
+# meson dist fails on CentOS 7 because of old git that fails to clone
+# from shallow git repository which is done when running meson dist
+.native_build_centos_7_job_template: &native_build_centos_7_job_definition
+  stage: builds
+  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+  cache:
+    paths:
+      - ccache/
+    key: "$CI_JOB_NAME"
+  before_script:
+    - *script_variables
+  script:
+    - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build
+    - ninja -C build test

 # Jobs that we delegate to Cirrus CI because they require an operating
 # system other than Linux. These jobs will only run if the required
@ -86,6 +100,8 @@ stages:
          -e "s|[@]PKGS@|$PKGS|g"
          -e "s|[@]MAKE@|$MAKE|g"
          -e "s|[@]PYTHON@|$PYTHON|g"
+          -e "s|[@]PIP@|$PIP|g"
+          -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
      <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
    - cat ci/cirrus/$NAME.yml
    - cirrus-run ci/cirrus/$NAME.yml
@ -104,10 +120,8 @@ stages:
  before_script:
    - *script_variables
  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - $MAKE
+    - meson build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build


 # Native container build jobs
@ -285,7 +299,7 @@ x64-debian-sid:
    NAME: debian-sid

 x64-centos-7:
-  <<: *native_build_job_definition
+  <<: *native_build_centos_7_job_definition
  variables:
    NAME: centos-7

@ -440,12 +454,8 @@ website:
  before_script:
    - *script_variables
  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh --prefix=$(pwd)/../vroot || (cat config.log && exit 1)
-    - $MAKE -C docs
-    - $MAKE -C docs install
-    - cd ..
+    - meson build --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build install-web
    - mv vroot/share/doc/libvirt/html/ website
  artifacts:
    expose_as: 'Website'
@ -462,10 +472,9 @@ codestyle:
  before_script:
    - *script_variables
  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE syntax-check
+    - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build libvirt-pot-dep
+    - meson test -C build --suite syntax-check --no-rebuild || (cat build/meson-logs/testlog.txt && exit 1)


 # This artifact published by this job is downloaded to push to Weblate
@ -479,12 +488,9 @@ potfile:
  before_script:
    - *script_variables
  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE -C src generated-sources
-    - $MAKE -C po libvirt.pot
-    - cd ..
+    - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
+    - ninja -C build libvirt-pot-dep
+    - ninja -C build libvirt-pot
    - cp po/libvirt.pot libvirt.pot
  artifacts:
    expose_as: 'Potfile'
--- a/ci/cirrus/build.yml
+++ b/ci/cirrus/build.yml
@ -13,13 +13,12 @@ env:
 build_task:
  install_script:
    - @INSTALL_COMMAND@ @PKGS@
+    - @PIP@ install @PYPI_PKGS@
  clone_script:
    - git clone --depth 100 "$CI_REPOSITORY_URL" .
    - git fetch origin "$CI_COMMIT_REF_NAME"
    - git reset --hard "$CI_COMMIT_SHA"
  build_script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh --prefix=$(pwd)/install-root
-    - if test "$(uname)" = "FreeBSD"; then $MAKE -j3 distcheck; fi
-    - if test "$(uname)" = "Darwin"; then $MAKE -j3 && $MAKE -j3 install && $MAKE -j3 dist; fi
+    - meson build --prefix=$(pwd)/install-root
+    - if test "$(uname)" = "FreeBSD"; then ninja -C build dist; fi
+    - if test "$(uname)" = "Darwin"; then ninja -C build && ninja -C build install; fi
--- a/ci/cirrus/libvirt-freebsd-12.vars
+++ b/ci/cirrus/libvirt-freebsd-12.vars
@ -4,4 +4,6 @@ CCACHE='/usr/local/bin/ccache'
 MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PYTHON='/usr/local/bin/python3'
-PKGS='augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof meson ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl'
+PIP='/usr/local/bin/pip-3.7'
+PKGS='augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl'
+PYPI_PKGS='meson==0.54.0'
--- a/ci/cirrus/libvirt-macos-1015.vars
+++ b/ci/cirrus/libvirt-macos-1015.vars
@ -4,4 +4,6 @@ CCACHE='/usr/local/bin/ccache'
 MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PYTHON='/usr/local/bin/python3'
-PKGS='augeas autoconf automake bash bash-completion ccache cpanminus cppi curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libiscsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make meson ncurses ninja perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl'
+PIP='/usr/local/bin/pip3'
+PKGS='augeas autoconf automake bash bash-completion ccache cpanminus cppi curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libiscsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make ncurses ninja perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl'
+PYPI_PKGS='meson==0.54.0'
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@ -128,7 +128,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@ -60,7 +60,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
        lsof \
        lvm2 \
        make \
-        meson \
        net-tools \
        netcf-devel \
        nfs-utils \
@ -102,6 +101,9 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"

 ENV MAKE "/usr/bin/make"
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@ -61,7 +61,6 @@ RUN dnf install -y centos-release-stream && \
        lsof \
        lvm2 \
        make \
-        meson \
        net-tools \
        netcf-devel \
        nfs-utils \
@ -103,6 +102,9 @@ RUN dnf install -y centos-release-stream && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"

 ENV MAKE "/usr/bin/make"
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -111,7 +110,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:arm64 \
            xfslibs-dev:arm64 && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
+ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'aarch64'\n\
+cpu = 'aarch64'\n\
+endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -123,3 +137,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "aarch64-linux-gnu"
 ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
+ENV MESON_OPTS "--cross-file=aarch64-linux-gnu"
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:armel \
            xfslibs-dev:armel && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'arm'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "arm-linux-gnueabi"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
+ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -111,7 +110,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:armhf \
            xfslibs-dev:armhf && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'armhf'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -123,3 +137,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "arm-linux-gnueabihf"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
+ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf"
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:i386 \
            xfslibs-dev:i386 && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/i686-linux-gnu-gcc'\n\
+ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/i686-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'x86'\n\
+cpu = 'i686'\n\
+endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "i686-linux-gnu"
 ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
+ENV MESON_OPTS "--cross-file=i686-linux-gnu"
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:mips \
            xfslibs-dev:mips && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/mips-linux-gnu-gcc'\n\
+ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mips-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mips'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mips-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "mips-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
+ENV MESON_OPTS "--cross-file=mips-linux-gnu"
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:mips64el \
            xfslibs-dev:mips64el && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
+ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
+strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
+pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips64'\n\
+cpu = 'mips64el'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "mips64el-linux-gnuabi64"
 ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
+ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64"
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:mipsel \
            xfslibs-dev:mipsel && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
+ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mipsel'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "mipsel-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
+ENV MESON_OPTS "--cross-file=mipsel-linux-gnu"
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:ppc64el \
            xfslibs-dev:ppc64el && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
+ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'ppc64'\n\
+cpu = 'powerpc64le'\n\
+endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "powerpc64le-linux-gnu"
 ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
+ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu"
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -110,7 +109,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:s390x \
            xfslibs-dev:s390x && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/s390x-linux-gnu-gcc'\n\
+ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/s390x-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 's390x'\n\
+cpu = 's390x'\n\
+endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu
+
+RUN pip3 install \
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

@ -122,3 +136,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "s390x-linux-gnu"
 ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
+ENV MESON_OPTS "--cross-file=s390x-linux-gnu"
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@ -69,7 +69,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -106,6 +105,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"

 ENV MAKE "/usr/bin/make"
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@ -111,7 +111,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:arm64 \
            xfslibs-dev:arm64 && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
+ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'aarch64'\n\
+cpu = 'aarch64'\n\
+endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu

 ENV LANG "en_US.UTF-8"

@ -123,3 +135,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "aarch64-linux-gnu"
 ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
+ENV MESON_OPTS "--cross-file=aarch64-linux-gnu"
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:armel \
            xfslibs-dev:armel && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'arm'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "arm-linux-gnueabi"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
+ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@ -111,7 +111,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:armhf \
            xfslibs-dev:armhf && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
+ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
+strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'arm'\n\
+cpu = 'armhf'\n\
+endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf

 ENV LANG "en_US.UTF-8"

@ -123,3 +135,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "arm-linux-gnueabihf"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
+ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf"
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:i386 \
            xfslibs-dev:i386 && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/i686-linux-gnu-gcc'\n\
+ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/i686-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'x86'\n\
+cpu = 'i686'\n\
+endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "i686-linux-gnu"
 ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
+ENV MESON_OPTS "--cross-file=i686-linux-gnu"
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:mips64el \
            xfslibs-dev:mips64el && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
+ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
+strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
+pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips64'\n\
+cpu = 'mips64el'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "mips64el-linux-gnuabi64"
 ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
+ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64"
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:mipsel \
            xfslibs-dev:mipsel && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
+ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'mips'\n\
+cpu = 'mipsel'\n\
+endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "mipsel-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
+ENV MESON_OPTS "--cross-file=mipsel-linux-gnu"
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:ppc64el \
            xfslibs-dev:ppc64el && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
+ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 'ppc64'\n\
+cpu = 'powerpc64le'\n\
+endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "powerpc64le-linux-gnu"
 ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
+ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu"
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@ -110,7 +110,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            libyajl-dev:s390x \
            xfslibs-dev:s390x && \
    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get autoclean -y && \
+    mkdir -p /usr/local/share/meson/cross && \
+    echo "[binaries]\n\
+c = '/usr/bin/s390x-linux-gnu-gcc'\n\
+ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
+strip = '/usr/bin/s390x-linux-gnu-strip'\n\
+pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
+\n\
+[host_machine]\n\
+system = 'linux'\n\
+cpu_family = 's390x'\n\
+cpu = 's390x'\n\
+endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu

 ENV LANG "en_US.UTF-8"

@ -122,3 +134,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

 ENV ABI "s390x-linux-gnu"
 ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
+ENV MESON_OPTS "--cross-file=s390x-linux-gnu"
--- a/ci/containers/libvirt-fedora-31.Dockerfile
+++ b/ci/containers/libvirt-fedora-31.Dockerfile
@ -58,7 +58,6 @@ RUN dnf update -y && \
        lsof \
        lvm2 \
        make \
-        meson \
        net-tools \
        netcf-devel \
        nfs-utils \
@ -103,6 +102,9 @@ RUN dnf update -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"

 ENV MAKE "/usr/bin/make"
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@ -100,7 +100,7 @@ RUN zypper update -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@ -108,7 +108,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0

 ENV LANG "en_US.UTF-8"

--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            lsof \
            lvm2 \
            make \
-            meson \
            net-tools \
            nfs-common \
            ninja-build \
@ -107,6 +106,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"

 ENV MAKE "/usr/bin/make"