From nobody Thu May 2 02:54:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1640191836; cv=none; d=zohomail.com; s=zohoarc; b=fSAwTgqTESZGqTeGCEglx6ie7EQenFuHsgYoOBhLa2ZNx0fwa03VgbpQ3H5deNhINJeuSSSUvr8ziy36HIzyZ4bwTCoEesgYo/7psdoSvSGvvJ+p6z7TR8pe5H3I/61zDfSXjqUdgbeMyJ+TyREeMDhXEWdsJ57/uIZ4Q/oYtag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640191836; 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=S3pZ71Hr8+bIRWU+tO/wvgb5sP9XnYtxs30hqyXwsaI=; b=J6rIZxk0KtLACW+ECwxkDWy5Uzccr4jKK9GmWRwXY4CsRQROimT6YwJ/UfQQdEzqO+M2oKBjdsdpaIfj2mzuy+S/WW1Moylc45etlyrMGX4lmzkxWllnL2KLnRIIMymmZHcywScKPRLpH5XUxldPiu5p5EjxECKPkH0cwUBtNAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640191836014787.2944583778876; Wed, 22 Dec 2021 08:50:36 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-231-YfyAHoYiPla3djfKPk4Jwg-1; Wed, 22 Dec 2021 11:50:33 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A69D11F2DB; Wed, 22 Dec 2021 16:50:26 +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 7F3EB22DF4; Wed, 22 Dec 2021 16:50:25 +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 51A304BB7C; Wed, 22 Dec 2021 16:50:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BMGoLNj008652 for ; Wed, 22 Dec 2021 11:50:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id CC0F7108649E; Wed, 22 Dec 2021 16:50:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D6D7108649C for ; Wed, 22 Dec 2021 16:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640191834; 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=S3pZ71Hr8+bIRWU+tO/wvgb5sP9XnYtxs30hqyXwsaI=; b=HwgONyGylsx+6EjdgRr7a3mGOD+e5KRg9gI9QPVPc7wFndUa2+fuWO+ysrQtA/U+JXvuZd BTUNjw3CEA3jaJddmEeVStZPnTNSgvrOek/1bLR+GqdBUrysQIxI7W5w51RmG3yWEyubWp 6d+s1suZ+9VXRiPDWuevDtMrSZ6IUPQ= X-MC-Unique: YfyAHoYiPla3djfKPk4Jwg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] ci: Refresh dockerfiles Date: Wed, 22 Dec 2021 17:50:05 +0100 Message-Id: <019eab7240c6358a06aa25e8abad6398693d1d7c.1640191763.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.84 on 10.5.11.23 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) X-ZM-MESSAGEID: 1640191837930100001 Content-Type: text/plain; charset="utf-8" Apart from some churn, the important is the removal of 'netcf-devel' from the fedora rawhide container. Update to state as of 174fe4999204afcae (libvirt-ci). Signed-off-by: Peter Krempa --- Pushed as trivial. It makes CI green again. .../debian-10-cross-aarch64.Dockerfile | 18 +++++++++--------- .../debian-10-cross-armv6l.Dockerfile | 18 +++++++++--------- .../debian-10-cross-armv7l.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-i686.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-mips.Dockerfile | 18 +++++++++--------- .../debian-10-cross-mips64el.Dockerfile | 18 +++++++++--------- .../debian-10-cross-mipsel.Dockerfile | 18 +++++++++--------- .../debian-10-cross-ppc64le.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-s390x.Dockerfile | 18 +++++++++--------- .../debian-11-cross-aarch64.Dockerfile | 12 ++++++------ .../debian-11-cross-armv6l.Dockerfile | 12 ++++++------ .../debian-11-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-i686.Dockerfile | 12 ++++++------ .../debian-11-cross-mips64el.Dockerfile | 12 ++++++------ .../debian-11-cross-mipsel.Dockerfile | 12 ++++++------ .../debian-11-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-s390x.Dockerfile | 12 ++++++------ .../debian-sid-cross-aarch64.Dockerfile | 12 ++++++------ .../debian-sid-cross-armv6l.Dockerfile | 12 ++++++------ .../debian-sid-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-i686.Dockerfile | 12 ++++++------ .../debian-sid-cross-mips64el.Dockerfile | 12 ++++++------ .../debian-sid-cross-mipsel.Dockerfile | 12 ++++++------ .../debian-sid-cross-ppc64le.Dockerfile | 12 ++++++------ .../debian-sid-cross-s390x.Dockerfile | 12 ++++++------ .../fedora-35-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-35-cross-mingw64.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw64.Dockerfile | 12 ++++++------ ci/containers/fedora-rawhide.Dockerfile | 1 - 30 files changed, 201 insertions(+), 202 deletions(-) diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index 38013eb84b..cfbf5bb48f 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -117,14 +126,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/aa= rch64-linux-gnu && \ 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-g= cc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=3Daarch64-linux-gnu" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index f9bfa031fa..3308ac2e10 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabi && \ 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-g= cc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabi" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index 0ddb3c65f5..0dcd8ee1d7 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -117,14 +126,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabihf && \ 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= -gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabihf" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index da14c20b3a..8806dff0c3 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/i6= 86-linux-gnu && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index efaf7a155b..edc54fe1ac 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'big'" > /usr/local/share/meson/cross/mips-= linux-gnu && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips-linux-gnu" ENV MESON_OPTS "--cross-file=3Dmips-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index 896a730ebe..d988d82fbf 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= ps64el-linux-gnuabi64 && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index d50c2bcc8a..455edcae3c 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= psel-linux-gnu && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=3Dmipsel-linux-gnu" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index 8cbea4bee8..ad380052c9 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/po= werpc64le-linux-gnu && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=3Dpowerpc64le-linux-gnu" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index 3ad9a772c8..faeb450569 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson=3D=3D0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian =3D 'big'" > /usr/local/share/meson/cross/s390x= -linux-gnu && \ 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-gcc -RUN pip3 install \ - meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=3Ds390x-linux-gnu" diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containe= rs/debian-11-cross-aarch64.Dockerfile index a8b5ff293c..1d6ca0dd76 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/aa= rch64-linux-gnu && \ 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-g= cc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=3Daarch64-linux-gnu" diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/container= s/debian-11-cross-armv6l.Dockerfile index 53c6759085..6ad97f9034 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabi && \ 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-g= cc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabi" diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/container= s/debian-11-cross-armv7l.Dockerfile index 4d41db399f..28bcf1b655 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabihf && \ 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= -gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabihf" diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/= debian-11-cross-i686.Dockerfile index 0693c03e48..f7be68ed45 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/i6= 86-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/contain= ers/debian-11-cross-mips64el.Dockerfile index 0c2e4b6cc7..3e98e52874 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= ps64el-linux-gnuabi64 && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/container= s/debian-11-cross-mipsel.Dockerfile index 5a5c4c2a35..165612b747 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= psel-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=3Dmipsel-linux-gnu" diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-11-cross-ppc64le.Dockerfile index fdbe884a5c..d8706863c4 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/po= werpc64le-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=3Dpowerpc64le-linux-gnu" diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers= /debian-11-cross-s390x.Dockerfile index be4981d22f..4f699ee2b5 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'big'" > /usr/local/share/meson/cross/s390x= -linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=3Ds390x-linux-gnu" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/contain= ers/debian-sid-cross-aarch64.Dockerfile index 883a5fe526..eac0c95c88 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/aa= rch64-linux-gnu && \ 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-g= cc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=3Daarch64-linux-gnu" diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index 418b5295b4..5b53d741dd 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabi && \ 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-g= cc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabi" diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index 8116ee3475..2eae6f073b 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/ar= m-linux-gnueabihf && \ 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= -gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabihf" diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index 63f770a366..3b9f6ba389 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/i6= 86-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index fb7b02ce88..0d90f002ae 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= ps64el-linux-gnuabi64 && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index 6c2d871a08..e29ca9eee3 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/mi= psel-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=3Dmipsel-linux-gnu" diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index abcf271072..5707c8a57d 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'little'" > /usr/local/share/meson/cross/po= werpc64le-linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=3Dpowerpc64le-linux-gnu" diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index 00a999a284..25aa6513cc 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian =3D 'big'" > /usr/local/share/meson/cross/s390x= -linux-gnu && \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=3Ds390x-linux-gnu" diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containe= rs/fedora-35-cross-mingw32.Dockerfile index 0a26a1f9bd..de514525c6 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -62,6 +62,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ @@ -82,11 +88,5 @@ RUN nosync dnf install -y \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containe= rs/fedora-35-cross-mingw64.Dockerfile index e2a3ba9d6d..34dd93ccd9 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -62,6 +62,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ @@ -82,11 +88,5 @@ RUN nosync dnf install -y \ 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-= gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index 31006b8092..f8eb7abe7e 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -63,6 +63,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ @@ -83,11 +89,5 @@ RUN nosync dnf install -y \ 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-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index c9b01984b5..feec913384 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -63,6 +63,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ @@ -83,11 +89,5 @@ RUN nosync dnf install -y \ 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-= gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index 97476535b9..ff18e89e66 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -72,7 +72,6 @@ exec "$@"' > /usr/bin/nosync && \ lvm2 \ make \ meson \ - netcf-devel \ nfs-utils \ ninja-build \ numactl-devel \ --=20 2.31.1