From nobody Fri May 17 10:13:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1618509404; cv=none; d=zohomail.com; s=zohoarc; b=JqWqvyC5PcDYKCfS0H8flzwT0Tq0D7NGZWbouU+tfjiNATVEHLf9qRFYHwvY52uOMv3M0k+Si/d0bmoYn7q7zqggi0PQ6Ls1dcf4F/PNG+7zjBhp9VAVb+QIvYlhny5UDm0MDQpp7uDUpd+C5NWgjMUQiGaRCHLch1l5SFY3ys4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618509404; 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=lHjkE0JSVSwgzxdP+qHL6LcECnGMOQuqFBHuCZoM1Lo=; b=aFtTE7NsdG6VEJyTSUXowXiRf+uepkDt533DKnSWKc5j+NSQm6Ed9JYeshuyjroOXwomxIe4oyIWgO8g8wcegzKWQYvBpnFOPtC+nO/q6OF605+FyKXIyE5HBTcISJKWC68dyUsgf142TQmY2XQYVJGJ2ce11kkEG43SgPHtrdc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618509404507552.0583198056974; Thu, 15 Apr 2021 10:56:44 -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-496-QtNRISxwMPOrkKe5dA47mQ-1; Thu, 15 Apr 2021 13:56:39 -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 3B77B1854E27; Thu, 15 Apr 2021 17:56:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8EEE62677; Thu, 15 Apr 2021 17:56:27 +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 2BA0C44A5A; Thu, 15 Apr 2021 17:56:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13FHuLdA015271 for ; Thu, 15 Apr 2021 13:56:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id B755A6A046; Thu, 15 Apr 2021 17:56:21 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 905096A03D for ; Thu, 15 Apr 2021 17:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618509402; 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=lHjkE0JSVSwgzxdP+qHL6LcECnGMOQuqFBHuCZoM1Lo=; b=RbouRn3MYyV6GpvXJw5bn5lkhoeBCBR79+3aHQwMgWgQjBUIz7CWvCLuf1lYvyYYqAtZ1j Xvzd8/62F+E0Xhhj72LGMZ1bXI899uuQFUNhFM75TaXZFHTufsDVfIfA3v42PjnG9ugiXN GFJjSsTzijkVINhAL74OPj/C7HLBQPI= X-MC-Unique: QtNRISxwMPOrkKe5dA47mQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [PATCH] ci: Refresh contents Date: Thu, 15 Apr 2021 19:56:12 +0200 Message-Id: <20210415175612.62042-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: * cross-building container images are smaller because they no longer include the native compilers; * ccache is enabled for clang builds. Signed-off-by: Andrea Bolognani --- Pushed under the CI refresh rule. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/287122672 ci/cirrus/freebsd-12.vars | 7 ++++++- ci/cirrus/freebsd-current.vars | 7 ++++++- ci/cirrus/macos-11.vars | 7 ++++++- ci/containers/centos-7.Dockerfile | 9 ++++++--- ci/containers/centos-8.Dockerfile | 9 ++++++--- ci/containers/centos-stream.Dockerfile | 9 ++++++--- ci/containers/debian-10-cross-aarch64.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv6l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv7l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-i686.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips64el.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mipsel.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-ppc64le.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-s390x.Dockerfile | 10 +++++----- ci/containers/debian-10.Dockerfile | 9 ++++++--- ci/containers/debian-sid-cross-aarch64.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv6l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv7l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-i686.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mips64el.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mipsel.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-s390x.Dockerfile | 8 ++++---- ci/containers/debian-sid.Dockerfile | 7 +++++-- ci/containers/fedora-32.Dockerfile | 7 +++++-- ci/containers/fedora-33.Dockerfile | 7 +++++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide.Dockerfile | 7 +++++-- ci/containers/opensuse-152.Dockerfile | 9 ++++++--- ci/containers/ubuntu-1804.Dockerfile | 9 ++++++--- ci/containers/ubuntu-2004.Dockerfile | 9 ++++++--- 33 files changed, 165 insertions(+), 113 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 115fd89727..7bd875176e 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-12 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + PACKAGING_COMMAND=3D'pkg' -CC=3D'/usr/bin/clang' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 115fd89727..0f5b704a7b 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-current libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + PACKAGING_COMMAND=3D'pkg' -CC=3D'/usr/bin/clang' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index ba0e77d728..8965338456 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-11 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + PACKAGING_COMMAND=3D'brew' -CC=3D'/usr/bin/clang' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Doc= kerfile index d1de34cedf..49345fa128 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/centos:7 =20 RUN yum update -y && \ @@ -47,6 +48,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -123,10 +125,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 d55115fe29..0c7292b8d2 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/centos:8 =20 RUN dnf update -y && \ @@ -18,6 +19,7 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -95,10 +97,11 @@ RUN dnf update -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 a6715700c9..3bc66775eb 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/centos:8 =20 RUN dnf install -y centos-release-stream && \ @@ -20,6 +21,7 @@ RUN dnf install -y centos-release-stream && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -97,10 +99,11 @@ RUN dnf install -y centos-release-stream && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 50476a7f5c..e006dcc68b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$= (basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g= cc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ @@ -120,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.55.3 + meson=3D=3D0.56.0 =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 aed38f6f3d..abc3ef52db 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$= (basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g= cc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 714e28ad07..2e9bedf614 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ @@ -120,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.55.3 + meson=3D=3D0.56.0 =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 7fcd38ff7b..4b88d751bd 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc &= & \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(ba= sename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 09d0653e13..dbdc9c57a8 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc &= & \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(ba= sename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 07ce89e16f..37044e296d 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 644b822302..3587f52374 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(= basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 f2e61268e9..e8699d896b 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 e9b89c299a..b31b5fd051 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc = && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(b= asename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ @@ -119,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.55.3 + meson=3D=3D0.56.0 =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 fbc06b3314..d4ab8196c2 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -97,10 +99,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 373b9ad31a..514f42a83e 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$= (basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g= cc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index e32d0fd230..592c485f64 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$= (basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g= cc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index cc46822665..f4e9829961 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index a4cd1c1070..500e306f8b 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc &= & \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(ba= sename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index 76298a7e4e..1ed444d9d3 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index 3c69ce545f..e30e1cf808 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(= basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index c274e106a0..430cd1176c 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index 7d9120c93e..716002dbaa 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc = && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(b= asename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid= .Dockerfile index d1141ea307..011b766715 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -95,7 +97,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.D= ockerfile index 71c78c76dc..9b06bcbac5 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.fedoraproject.org/fedora:32 =20 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.D= ockerfile index 08cd40bc3a..2885eafbb0 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.fedoraproject.org/fedora:33 =20 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index 1ac0c08e4c..139e0b145c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(= basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc =20 RUN nosync dnf install -y \ mingw32-curl \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index 767e43639d..b24049f879 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= $(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= gcc =20 RUN nosync dnf install -y \ mingw64-curl \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index 7cb68dcd50..1f0abb7288 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -25,6 +26,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -104,7 +106,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse= -152.Dockerfile index 8688934e92..6b56641292 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM registry.opensuse.org/opensuse/leap:15.2 =20 RUN zypper update -y && \ @@ -15,6 +16,7 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-1-devel \ @@ -91,10 +93,11 @@ RUN zypper update -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 55b7821cba..c6c3ef5823 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/ubuntu:18.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -99,10 +101,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =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 04427b81d0..78df341dca 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951= 355800d8135ce82 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255= eca542937f7d4ea + FROM docker.io/library/ubuntu:20.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -98,10 +100,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN pip3 install \ - meson=3D=3D0.55.3 + meson=3D=3D0.56.0 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" --=20 2.26.3