From nobody Tue May 7 23:42:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616676869; cv=none; d=zohomail.com; s=zohoarc; b=c4wVe77p8GLNMCkxgsQ5IGGimu7KmtU0lKtHdOEOt4XZaDd2VdXgWkxDPTob4l6Eqfxv2yodtOxLw1wzWQR8Yud/zc4Ff1yF6CitpmBIbHstQcV2xNki5sOx+VCSwBxLSyT8x8igl0D8P94nEy6j8c9UT9Yy6iL8CA3w9SjxHHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616676869; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=4Kti8deNfDATDlJNvlfqddaAcu2sjUzgxAtQKcpIMlQ=; b=fTIAS9r9icxdMbxB6vPOI1WkuttkN/XDtcyYM9k78Jj+ZhLR3tkwohMDWrYE0DpPtTzfILe4Ns/Hn7TzYAf6Foc+UybqOaysii9emiWUYvlXWqcw+Gu+mj28V0wXAevW5y1E4f//uNcVmoC2/+HRx+zuC0cs3/E2g4FpZNKzW7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616676869031703.560179860988; Thu, 25 Mar 2021 05:54:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-tMsqJtoTMkSUXeLh4A67cQ-1; Thu, 25 Mar 2021 08:54:25 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46AAC83DC24; Thu, 25 Mar 2021 12:54:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6FE506267A; Thu, 25 Mar 2021 12:54:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4D3DD1809C84; Thu, 25 Mar 2021 12:54:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12PCruOo002333 for ; Thu, 25 Mar 2021 08:53:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77BEB5D9DE; Thu, 25 Mar 2021 12:53:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D07C85D9CA for ; Thu, 25 Mar 2021 12:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616676867; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4Kti8deNfDATDlJNvlfqddaAcu2sjUzgxAtQKcpIMlQ=; b=OVkdlSYEdKdnfTzaZchJrBmXVNJWepTGmhXj3mGBt8j942ooi5i8KA+HOf5E9lSwXLG2aF aHLPrLa+/nxtJH24L2r//5n7qDzL0Uih+EAXDIEuJ+ZfnXDY+DtSB8osgBkjqzhK2INMxF jDIwxC54/QKf3LLkGVsImEq91wmasIY= X-MC-Unique: tMsqJtoTMkSUXeLh4A67cQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2] ci: Refresh information Date: Thu, 25 Mar 2021 13:53:27 +0100 Message-Id: <20210325125327.19823-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Notable changes: * HAL is no longer installed on FreeBSD; * the native version of libwsman is no longer installed in containers intended for cross-compilation; * Meson 0.55 rather than 0.54 is requested when installing it from PyPI; * GNU sed and GNU grep are installed explicitly everywhere. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- Changes from [v1]: * install GNU grep and GNU sed everywhere. I didn't push the original patch, even though it had already been ACKed, to avoid unnecessary container rebuilds. [v1] https://listman.redhat.com/archives/libvir-list/2021-March/msg01211.ht= ml ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-7.Dockerfile | 6 ++++-- ci/containers/centos-8.Dockerfile | 6 ++++-- ci/containers/centos-stream.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-aarch64.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-armv6l.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-armv7l.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-i686.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mips.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mips64el.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mipsel.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-ppc64le.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-s390x.Dockerfile | 6 ++++-- ci/containers/debian-10.Dockerfile | 6 ++++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 +++- ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 +++- ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 +++- ci/containers/debian-sid-cross-i686.Dockerfile | 4 +++- ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 +++- ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 +++- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 +++- ci/containers/debian-sid-cross-s390x.Dockerfile | 4 +++- ci/containers/debian-sid.Dockerfile | 4 +++- ci/containers/fedora-32.Dockerfile | 4 +++- ci/containers/fedora-33.Dockerfile | 4 +++- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 5 +++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 5 +++-- ci/containers/fedora-rawhide.Dockerfile | 4 +++- ci/containers/opensuse-152.Dockerfile | 6 ++++-- ci/containers/ubuntu-1804.Dockerfile | 6 ++++-- ci/containers/ubuntu-2004.Dockerfile | 6 ++++-- 33 files changed, 109 insertions(+), 51 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 5add0fb058..115fd89727 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -5,4 +5,4 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' PIP3=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnut= ls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl= 5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnug= rep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson n= inja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd read= line yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 5add0fb058..115fd89727 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -5,4 +5,4 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' PIP3=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnut= ls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl= 5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnug= rep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson n= inja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd read= line yajl' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index c29b8b13b8..ba0e77d728 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -5,4 +5,4 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' PIP3=3D'/usr/local/bin/pip3' -PKGS=3D'augeas bash-completion ccache cppi curl dbus diffutils dnsmasq doc= utils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml= 2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scr= ub yajl' +PKGS=3D'augeas bash-completion ccache cppi curl dbus diffutils dnsmasq doc= utils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh l= ibssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readli= ne rpcgen scrub yajl' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Doc= kerfile index c499e7a19d..d1de34cedf 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/centos:7 =20 RUN yum update -y && \ @@ -64,6 +64,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ glibc-devel \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iptables \ iscsi-initiator-utils \ @@ -111,6 +112,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ @@ -124,7 +126,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Doc= kerfile index e600598329..d55115fe29 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/centos:8 =20 RUN dnf update -y && \ @@ -35,6 +35,7 @@ RUN dnf update -y && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -84,6 +85,7 @@ RUN dnf update -y && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xfsprogs-devel \ @@ -96,7 +98,7 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-= stream.Dockerfile index 2b51eccc8d..a6715700c9 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/centos:8 =20 RUN dnf install -y centos-release-stream && \ @@ -37,6 +37,7 @@ RUN dnf install -y centos-release-stream && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -86,6 +87,7 @@ RUN dnf install -y centos-release-stream && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xfsprogs-devel \ @@ -98,7 +100,7 @@ RUN dnf install -y centos-release-stream && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index 272c809f17..50476a7f5c 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -118,7 +120,7 @@ cpu =3D 'aarch64'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index e877b5e0b3..aed38f6f3d 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'arm'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index d8cbc82334..714e28ad07 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -118,7 +120,7 @@ cpu =3D 'armhf'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index ed056c31b5..7fcd38ff7b 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'i686'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index 969964faf2..09d0653e13 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'mips'\n\ endian =3D 'big'" > /usr/local/share/meson/cross/mips-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index a78492971f..07ce89e16f 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'mips64el'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index 857173f261..644b822302 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'mipsel'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index 349cc1e487..f2e61268e9 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 'powerpc64le'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index e79381e69a..e9b89c299a 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu =3D 's390x'\n\ endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.D= ockerfile index bac8589f2c..fbc06b3314 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ @@ -98,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/contain= ers/debian-sid-cross-aarch64.Dockerfile index f0831c1fed..373b9ad31a 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index c3661e2e7d..e32d0fd230 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index 4322046e8d..cc46822665 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index a48ff3471c..a4cd1c1070 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index 9f3325b546..76298a7e4e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index 39993132ac..3c69ce545f 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index ebb4389e69..c274e106a0 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index 8cc22358cf..7d9120c93e 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid= .Dockerfile index a1ef98e67c..d1141ea307 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.D= ockerfile index 71d391b7bd..71c78c76dc 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.fedoraproject.org/fedora:32 =20 RUN dnf install -y nosync && \ @@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.D= ockerfile index 5fb30380b0..08cd40bc3a 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.fedoraproject.org/fedora:33 =20 RUN dnf install -y nosync && \ @@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index c718778acb..1ac0c08e4c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \ firewalld-filesystem \ git \ glibc-langpack-en \ + grep \ iproute \ iproute-tc \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ @@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ + sed \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index 6058d0c0b2..767e43639d 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \ firewalld-filesystem \ git \ glibc-langpack-en \ + grep \ iproute \ iproute-tc \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ @@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ + sed \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index 027e8a7c41..7cb68dcd50 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -43,6 +43,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -90,6 +91,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse= -152.Dockerfile index 00521f7796..8688934e92 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM registry.opensuse.org/opensuse/leap:15.2 =20 RUN zypper update -y && \ @@ -31,6 +31,7 @@ RUN zypper update -y && \ glibc-devel \ glibc-locale \ glusterfs-devel \ + grep \ iproute2 \ iptables \ kmod \ @@ -81,6 +82,7 @@ RUN zypper update -y && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ @@ -92,7 +94,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-18= 04.Dockerfile index 3d18274d00..55b7821cba 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/ubuntu:18.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gettext \ git \ glusterfs-common \ + grep \ iproute2 \ iptables \ kmod \ @@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ sheepdog \ systemtap-sdt-dev \ wireshark-dev \ @@ -100,7 +102,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-20= 04.Dockerfile index 9018c9d22e..04427b81d0 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fce= d7d1d882d6f0b6a +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 FROM docker.io/library/ubuntu:20.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ @@ -99,7 +101,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.54.0 + meson=3D=3D0.55.3 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" --=20 2.26.3