From nobody Sat Feb 7 05:49:10 2026 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=1680170524; cv=none; d=zohomail.com; s=zohoarc; b=O8qPwK6R2a+Ie78hZ0T+ii4Fc61NipwrSi4GJZo29VtkGF46D2UK/xj9yluJlOAPlecMiB3EHKuZDfhzIgUzzTQ6p7jcqpodM2JaIxmpD88UUrMNrZyZwqu2Gqk5zYilK6CeBFsEHFuyVLxP969hi1uDL1tjokRh+PeypW5bzNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680170524; 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=4Box9S9AL5uqISHy2s6k2UOFW3UdZn9SZLmUk9GqhWU=; b=mx5SjP0y6Vnb+oceJ9P7ommOlqtkme3kWYH+/iQDGvx+y76c3mI5twdyNKObpVskJ6NCfrcj4FAz6DhGutJoguM7rAVeSJFdp1AWBm7eVkwOLmPXlJcObCbdE3eQfIcugcAqsWvsuwcIqrGZWqvBlLl9jRBDXugJg+VFVA4FJnk= 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 1680170524155279.2127217380489; Thu, 30 Mar 2023 03:02:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-33-m0lsxQKONhuRwZCrJRijfA-1; Thu, 30 Mar 2023 06:01:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E163E85A5B1; Thu, 30 Mar 2023 10:01:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AB23C15BBA; Thu, 30 Mar 2023 10:01:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2916519465B6; Thu, 30 Mar 2023 10:01:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3FC8619465B2 for ; Thu, 30 Mar 2023 10:01:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2D7E8404E4C9; Thu, 30 Mar 2023 10:01:15 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42B00404E4AD for ; Thu, 30 Mar 2023 10:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680170522; 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=4Box9S9AL5uqISHy2s6k2UOFW3UdZn9SZLmUk9GqhWU=; b=EN1+FH5UfJGnH3hrqWumDDn7k+O+jqlX/VYq5Zn04fXSPkVfDiw4tU1fpqdHzkpJ16vWjc 4/s/ZSvxzr9rhhNpJ7jsMpz7f/IvmHpvEMcoNwQSqGdfUKrDALCLg7il5zXAY4XKbbe8m4 8RhAqzx8n5b489/zi2Cs91XA5nbHk04= X-MC-Unique: m0lsxQKONhuRwZCrJRijfA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] ci: Regenerate files Date: Thu, 30 Mar 2023 12:01:12 +0200 Message-Id: <20230330100112.362506-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1680170526333100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This unbreaks the various $CROSS-$NAME-local-env jobs. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/822671796 ci/buildenv/debian-11-cross-aarch64.sh | 4 ++-- ci/buildenv/debian-11-cross-armv6l.sh | 4 ++-- ci/buildenv/debian-11-cross-armv7l.sh | 4 ++-- ci/buildenv/debian-11-cross-i686.sh | 4 ++-- ci/buildenv/debian-11-cross-mips64el.sh | 4 ++-- ci/buildenv/debian-11-cross-mipsel.sh | 4 ++-- ci/buildenv/debian-11-cross-ppc64le.sh | 4 ++-- ci/buildenv/debian-11-cross-s390x.sh | 4 ++-- ci/buildenv/debian-sid-cross-aarch64.sh | 4 ++-- ci/buildenv/debian-sid-cross-armv6l.sh | 4 ++-- ci/buildenv/debian-sid-cross-armv7l.sh | 4 ++-- ci/buildenv/debian-sid-cross-i686.sh | 4 ++-- ci/buildenv/debian-sid-cross-mips64el.sh | 4 ++-- ci/buildenv/debian-sid-cross-mipsel.sh | 4 ++-- ci/buildenv/debian-sid-cross-ppc64le.sh | 4 ++-- ci/buildenv/debian-sid-cross-s390x.sh | 4 ++-- ci/containers/debian-11-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-11-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-11-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-11-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-11-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-11-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-11-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-11-cross-s390x.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-s390x.Dockerfile | 4 ++-- ci/containers/fedora-36.Dockerfile | 4 ++-- ci/containers/fedora-37-cross-mingw32.Dockerfile | 4 ++-- ci/containers/fedora-37-cross-mingw64.Dockerfile | 4 ++-- ci/containers/fedora-37.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 4 ++-- ci/containers/fedora-rawhide.Dockerfile | 4 ++-- ci/gitlab/build-templates.yml | 9 +++++---- 40 files changed, 83 insertions(+), 82 deletions(-) diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11= -cross-aarch64.sh index d33d95d965..6b03b2ea59 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:arm64 \ systemtap-sdt-dev:arm64 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -98,7 +98,7 @@ 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'\n" > /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-cc diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-= cross-armv6l.sh index 00b978b946..51dc4ce88a 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:armel \ systemtap-sdt-dev:armel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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-cc diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-= cross-armv7l.sh index 78f596a96f..ecd1453bff 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -98,7 +98,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cr= oss-i686.sh index 0c08bb13a3..3922591cd8 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:i386 \ systemtap-sdt-dev:i386 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/i686-linux-gnu-gcc'\n\ ar =3D '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/i686-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-1= 1-cross-mips64el.sh index 386b67ee08..6a6250ac03 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mips64el \ systemtap-sdt-dev:mips64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-confi= g'\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'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 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 diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-= cross-mipsel.sh index 00138feee3..4b60a97704 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mipsel \ systemtap-sdt-dev:mipsel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11= -cross-ppc64le.sh index 30c8160f73..c1fd55b55d 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:ppc64el \ systemtap-sdt-dev:ppc64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-config'= \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'\n" > /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 diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-c= ross-s390x.sh index 1a4a5cf5c3..563eb98ef7 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:s390x \ systemtap-sdt-dev:s390x mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-s= id-cross-aarch64.sh index d33d95d965..6b03b2ea59 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:arm64 \ systemtap-sdt-dev:arm64 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -98,7 +98,7 @@ 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'\n" > /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-cc diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-si= d-cross-armv6l.sh index 00b978b946..51dc4ce88a 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:armel \ systemtap-sdt-dev:armel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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-cc diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-si= d-cross-armv7l.sh index 78f596a96f..ecd1453bff 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -98,7 +98,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-= cross-i686.sh index 0c08bb13a3..3922591cd8 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:i386 \ systemtap-sdt-dev:i386 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/i686-linux-gnu-gcc'\n\ ar =3D '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/i686-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-= sid-cross-mips64el.sh index 386b67ee08..6a6250ac03 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mips64el \ systemtap-sdt-dev:mips64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-confi= g'\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'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 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 diff --git a/ci/buildenv/debian-sid-cross-mipsel.sh b/ci/buildenv/debian-si= d-cross-mipsel.sh index 00138feee3..4b60a97704 100644 --- a/ci/buildenv/debian-sid-cross-mipsel.sh +++ b/ci/buildenv/debian-sid-cross-mipsel.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mipsel \ systemtap-sdt-dev:mipsel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-s= id-cross-ppc64le.sh index 30c8160f73..c1fd55b55d 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:ppc64el \ systemtap-sdt-dev:ppc64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-config'= \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'\n" > /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 diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid= -cross-s390x.sh index 1a4a5cf5c3..563eb98ef7 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:s390x \ systemtap-sdt-dev:s390x mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ 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'\n" > /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 diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containe= rs/debian-11-cross-aarch64.Dockerfile index d030a9a9df..429f58b45b 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -111,7 +111,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/container= s/debian-11-cross-armv6l.Dockerfile index 5958957aaa..85af350e04 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/container= s/debian-11-cross-armv7l.Dockerfile index c963657daa..77ff18a513 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -111,7 +111,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/= debian-11-cross-i686.Dockerfile index 9fe55f4f17..bdb4c44a42 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/i686-linux-gnu-gcc'\n\ ar =3D '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/i686-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 &= & \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/contain= ers/debian-11-cross-mips64el.Dockerfile index d4bf055915..6c1fd4ca77 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-con= fig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ 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 && \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/container= s/debian-11-cross-mipsel.Dockerfile index d9b5aa2798..5b0767f368 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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= && \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-11-cross-ppc64le.Dockerfile index 3ae70cfc51..600d5b34b2 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-confi= g'\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'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gn= u && \ 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 && \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers= /debian-11-cross-s390x.Dockerfile index 4a4a582990..d11c966c27 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 = && \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/contain= ers/debian-sid-cross-aarch64.Dockerfile index f129d6f3bf..c98ba2f751 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -111,7 +111,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index 7fb8b62528..de3ad751d6 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index 105fe3cb93..b271c97950 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -111,7 +111,7 @@ 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'\n" > /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 && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index 74e21c3d06..a12507feca 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/i686-linux-gnu-gcc'\n\ ar =3D '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/i686-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 &= & \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index 4af1ccd2e5..9a4c8387ce 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-con= fig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ 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 && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index 3227c9b948..2d18455474 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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= && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index 83d7c87ffe..fa646e3d54 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-confi= g'\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'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gn= u && \ 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 && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index 735790cbcd..e1d94bd642 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ 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'\n" > /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 = && \ diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.D= ockerfile index 3fa19e3c2c..df7a4a6bdc 100644 --- a/ci/containers/fedora-36.Dockerfile +++ b/ci/containers/fedora-36.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:36 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37-cross-mingw32.Dockerfile b/ci/containe= rs/fedora-37-cross-mingw32.Dockerfile index 14fb25a17e..7e6c16e4b6 100644 --- a/ci/containers/fedora-37-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw32.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37-cross-mingw64.Dockerfile b/ci/containe= rs/fedora-37-cross-mingw64.Dockerfile index c468dd7a6c..d673871516 100644 --- a/ci/containers/fedora-37-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw64.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.D= ockerfile index 17f586af59..d8e87bd310 100644 --- a/ci/containers/fedora-37.Dockerfile +++ b/ci/containers/fedora-37.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index a574acfde4..41221256f8 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index b2690b42e1..8737203d83 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index f903d549b7..a2ca2e9c61 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 82ddd2c650..1f533ec2dd 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -181,7 +181,7 @@ - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: never - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual @@ -197,7 +197,7 @@ stage: builds interruptible: true before_script: - - source ci/buildenv/$NAME.sh + - source ci/buildenv/$NAME-cross-$CROSS.sh - install_buildenv - cat /packages.txt rules: @@ -237,13 +237,13 @@ - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: manual allow_failure: true - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: on_success =20 # upstream+forks: merge requests targeting non-default branches @@ -266,6 +266,7 @@ - source ci/cirrus/$NAME.vars - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" + -e "s|[@]CI_MERGE_REQUEST_REF_PATH@|$CI_MERGE_REQUEST_REF_PATH|g" -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" --=20 2.39.2