From nobody Fri May 3 05:27:50 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=1634726343; cv=none; d=zohomail.com; s=zohoarc; b=BAt+yU8TcOW6RFnPLJABQEGsXGO4zQ8AgMHvhPAc7Cp+vTFuXJn8IYrwFbCJOxRhUEmWZGsvcG628TuWFSgr+T781H/mySKjbNcKYFVzh9OwcqX4JPUcDg/ew6p/vGyZ3PuLoCP6MJw5qI+MIor/nEQFqaFedS/8HBw8u9JbSM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634726343; 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=FNllN3bKGjhsmIxbhjnZD6qCWn/beobC5tgafOnG2bI=; b=iWih1AdiI0DT3mL3/EScwyY0OSQ5KFCcBvf9mNcRVPpJYuQYYvrPbD0aEo53v9vxsGmGiUMZeHxySN9yl2BPt4kFohuoLA4H3ua6uCXQ2trjfUFa8HbXUxDui3fvwoAeTE2qStClJZZoqRuZ1o/raszObDS1pdXj2dXLzxn1CWk= 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) 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 1634726343600551.511207271506; Wed, 20 Oct 2021 03:39:03 -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-92-2TDRxiaYNke8RMxoFeVuWQ-1; Wed, 20 Oct 2021 06:39:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 812EC8797E6; Wed, 20 Oct 2021 10:38:54 +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 8055270911; Wed, 20 Oct 2021 10:38:53 +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 5B2F61809C84; Wed, 20 Oct 2021 10:38:50 +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 19KAcmBE009782 for ; Wed, 20 Oct 2021 06:38:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE108ADD9; Wed, 20 Oct 2021 10:38:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E0665DD68; Wed, 20 Oct 2021 10:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634726342; 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=FNllN3bKGjhsmIxbhjnZD6qCWn/beobC5tgafOnG2bI=; b=iYnNeQrgXEN0lzYpEGo1phpK5l5cJiPRTICuWhiir5Zq5URnzgvdG2cHCon7pPEEtwcxq/ mdBXgnPRps2mRgDHNb0iVj2KpPeBbZvB8SZfw7hdKXy3vC0llVoP0n0DjrPYmDzCAFvJKs PQrG2VhtEYf0Z8gyu2DuZpSg1GsKs10= X-MC-Unique: 2TDRxiaYNke8RMxoFeVuWQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] ci: refresh configuration from manifest Date: Wed, 20 Oct 2021 11:38:42 +0100 Message-Id: <20211020103842.208156-1-berrange@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.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634726345086100001 The layering of the cross containers is fixed to move arch specific ccache setup out of the common base layer. A missing Cirrus CI variable substitution is added, though this is irrelevant given libvirt's package list. Signed-off-by: Daniel P. Berrang=C3=A9 --- ci/containers/debian-10-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mips.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-s390x.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-s390x.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-s390x.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw64.Dockerfile | 12 ++++++------ ci/gitlab.yml | 1 + 28 files changed, 163 insertions(+), 162 deletions(-) diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index 3f0010d081..38013eb84b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ @@ -115,7 +111,11 @@ pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'aarch64'\n\ cpu =3D 'aarch64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + 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-g= cc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index 853844d3f1..f9bfa031fa 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'arm'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + 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-g= cc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index 4d00116849..0ddb3c65f5 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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= -gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ @@ -115,7 +111,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config= '\n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'armhf'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf &&= \ + 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= -gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index 9c50fe0674..da14c20b3a 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/i686-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'x86'\n\ cpu =3D 'i686'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index fbeb8db795..efaf7a155b 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/mips-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mips'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/mips-linux-gnu +endian =3D 'big'" > /usr/local/share/meson/cross/mips-linux-gnu && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index 5212a02999..896a730ebe 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-co= nfig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index 2e9e716b21..d50c2bcc8a 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mipsel'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index 2f1a56a624..8cbea4bee8 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-conf= ig'\n\ system =3D 'linux'\n\ cpu_family =3D 'ppc64'\n\ cpu =3D 'powerpc64le'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu = && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index d7b06ec383..3ad9a772c8 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 's390x'\n\ cpu =3D 's390x'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + 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-gcc =20 RUN pip3 install \ meson=3D=3D0.56.0 diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containe= rs/debian-11-cross-aarch64.Dockerfile index 2e03f44d9e..a8b5ff293c 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'aarch64'\n\ cpu =3D 'aarch64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + 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-g= cc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/container= s/debian-11-cross-armv6l.Dockerfile index c021ddd7c7..53c6759085 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'arm'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + 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-g= cc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/container= s/debian-11-cross-armv7l.Dockerfile index 8ccb61680d..4d41db399f 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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= -gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config= '\n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'armhf'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf &&= \ + 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= -gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/= debian-11-cross-i686.Dockerfile index fce6d29a82..0693c03e48 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/i686-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'x86'\n\ cpu =3D 'i686'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/contain= ers/debian-11-cross-mips64el.Dockerfile index 2a1f0388ca..0c2e4b6cc7 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-co= nfig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/container= s/debian-11-cross-mipsel.Dockerfile index b678ad0b00..5a5c4c2a35 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mipsel'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-11-cross-ppc64le.Dockerfile index 66cf48506f..fdbe884a5c 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-conf= ig'\n\ system =3D 'linux'\n\ cpu_family =3D 'ppc64'\n\ cpu =3D 'powerpc64le'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu = && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers= /debian-11-cross-s390x.Dockerfile index a208c25d37..be4981d22f 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 's390x'\n\ cpu =3D 's390x'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + 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-gcc =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 e481c63388..883a5fe526 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'aarch64'\n\ cpu =3D 'aarch64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + 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-g= cc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index 3f63b3e86f..418b5295b4 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-g= cc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armel && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config'\= n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'arm'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + 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-g= cc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index 55f527b207..8116ee3475 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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= -gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ @@ -114,7 +110,11 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config= '\n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'armhf'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf &&= \ + 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= -gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index 719547ab31..63f770a366 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/i686-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'x86'\n\ cpu =3D 'i686'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index e1fac818a1..fb7b02ce88 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-co= nfig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index 3684fe3bf9..6c2d871a08 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mipsel'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index 1d1aa18e33..abcf271072 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-conf= ig'\n\ system =3D 'linux'\n\ cpu_family =3D 'ppc64'\n\ cpu =3D 'powerpc64le'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu = && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index 5d2fdd6a1b..00a999a284 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - 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-gcc + dpkg-reconfigure locales =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ @@ -113,7 +109,11 @@ pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 's390x'\n\ cpu =3D 's390x'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + 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-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 6f00940347..8b9a9d61ae 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -61,11 +61,7 @@ exec "$@"' > /usr/bin/nosync && \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - 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-gcc + nosync dnf clean all -y =20 RUN nosync dnf install -y \ mingw32-curl \ @@ -81,7 +77,11 @@ RUN nosync dnf install -y \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ - nosync dnf clean all -y + nosync dnf clean all -y && \ + 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-gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index 48c2a755d3..6293658420 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -61,11 +61,7 @@ exec "$@"' > /usr/bin/nosync && \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - 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-= gcc + nosync dnf clean all -y =20 RUN nosync dnf install -y \ mingw64-curl \ @@ -81,7 +77,11 @@ RUN nosync dnf install -y \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ - nosync dnf clean all -y + nosync dnf clean all -y && \ + 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-= gcc =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0678cb7ba0..2dfe2222de 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -57,6 +57,7 @@ -e "s|[@]PYTHON@|$PYTHON|g" -e "s|[@]PIP3@|$PIP3|g" -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" + -e "s|[@]XML_CATALOG_FILES@|$XML_CATALOG_FILES|g" ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml --=20 2.31.1