From patchwork Thu Jan 19 18:04:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 644108 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp360332pvb; Thu, 19 Jan 2023 10:07:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAKu+XWHdL1uTJOX7cksXMuoo7FH510aG2RC34k1gY6AbWvVLp1MyeZ8jpTRMAq0CT5wqh X-Received: by 2002:a25:fc17:0:b0:7c6:4471:19c4 with SMTP id v23-20020a25fc17000000b007c6447119c4mr9428285ybd.46.1674151623710; Thu, 19 Jan 2023 10:07:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674151623; cv=none; d=google.com; s=arc-20160816; b=mNpoaCAvkwPzIUM9fWHeUkmkKLpnMwqCv5RQet3Zemic0LeVmCsnkr4HimFZMxmYWF SQN75N3gIxH3HV+bu0duGvawQ+Anj41c/6oNTtBkejwlY/DHyZHF9F2emSPt1VkJ0ehE 25ki18z8ukYPe+BDfTtRxfpKp66FRnHcou1K/hJgSKxlaL7NdoT5BXCNgO9gV7PWnLTc Kjdwi+5cggW4BKXdauWAwS28hke67BtyE/84njCjRNJu4S6BNd6zkX7OfJciT2r6tobA De6rheEHYPKi0udV4DqRDyEWoznW5dOmS2b0jcY1iyq+sA7faLfmz+cY3OxKNuQPHtni IZ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=UsZ8O19ObiTG1MNSqgPzXOCaTYNUpl18ssMqOV6dEDWzCUDM1lHwVrxRpjfsnoEmam w0CfAZUHNMNHGvprCHRAstPh2Ap3yRUt5q0knUgS/px13AXYI/IjLePDME1oOqkdapQk THrO2VQNxHnx1OlmeNhVvfH0p7IoQolSVgTqXJfveQNs2qLUW43VKw/uDf2eteypp+iM ktRT2T5vs+y1kbI5i+3FI6WALshi3eClhWgpsVIz/bD2UaHo6cye64CtyfqN9rqOvGRT nibG0oCAGi0g+xRGr/l1a+CCBVQEI6FESLvJ+UW5ZGOCwVjX0ktqL3i2DqarmYqBd8Lx b/GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rhrRqYSJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bn43-20020a05620a2aeb00b00706b84dcdeasi3561147qkb.675.2023.01.19.10.07.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 10:07:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rhrRqYSJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIZHH-0003PB-CD; Thu, 19 Jan 2023 13:04:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIZH4-0003It-TH for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:31 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIZH1-00011b-12 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 13:04:30 -0500 Received: by mail-wr1-x432.google.com with SMTP id r9so2669076wrw.4 for ; Thu, 19 Jan 2023 10:04:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=rhrRqYSJI9OsKpMdvB3F/6evexZsTq1FU18XCHwm/DSiAOgbB/d8lXASOMIM/9/UVF zN602s9+JM8HS/P5yvNPsT7AXDXGyGm5+EGNt/tvNA5dDWQuC9k0c3fCu+ZnHLBV5v+k en3x4TdMNReWCZEiu4ng3nufreIIYBCisjOUlrL4SVugMZhtgQwm3eniaMux/hv8XBCm ygAryxj0spDn0t6iCVWRK6GObAsqallLlpiyGhhx4kHTFVApCHUGfEEcqDE4LFb/P9r0 72ZFhLn2CxhazGIoMBoOVh9PMpsgRzC2b9F7hlG+lmuA4iuI377xFuYuKVAQUVJwq2jt Y1Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=6MAmJ22KA0M3hFUL7eONi/LxtW1gDlMi9nS/JEjdbKh9iXdTTPpp+dtW4TL7dWLkI3 Z3BiXw0BSaqoKOqv6Lm9k/p2EUylWLBkP6EcOSctfF4TZ5Dy6Eqv8Xavs/teFmLMTT8x Q+3hDFT8tAuvmDEAZ8ABH1LAvkhzHDrddJDYE7E5pIZRY9uQYIcn0OzP45V9yrrYgNnI rTHRYRYbywygaWWk3sJbWQzNjtW+yTFd0P8m7veEI5uf1RRWhyqtQWYvpQxvsBZ50hEJ FIejr6L2ln2bm5Mvftc6M1twtPJ3ma9HPBQsgrqLfM+gEpmZOTtlGqJi2ASqcEAJ42AF qf1Q== X-Gm-Message-State: AFqh2koM+uFPHRNhz50MIjqeuSrOqBYsLoKdKMpih7UQSQFr4OSKvJ2R Dz5qzygLKC6I7aYUnN9Ge8yUhw== X-Received: by 2002:adf:fc4c:0:b0:2bd:dbbb:e7e2 with SMTP id e12-20020adffc4c000000b002bddbbbe7e2mr10000737wrs.60.1674151465608; Thu, 19 Jan 2023 10:04:25 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r10-20020adfda4a000000b0029a06f11022sm34378020wrl.112.2023.01.19.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:04:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8119C1FFB7; Thu, 19 Jan 2023 18:04:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Peter Maydell , Bandan Das , Qiuhao Li , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Michael Roth , Cleber Rosa , Alexander Bulekov , Darren Kenny , Stefan Hajnoczi , Markus Armbruster , John Snow , Ed Maste , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Li-Wen Hsu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 10/18] Update lcitool and fedora to 37 Date: Thu, 19 Jan 2023 18:04:11 +0000 Message-Id: <20230119180419.30304-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org> References: <20230119180419.30304-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Fedora 35 is EOL. Update to upstream lcitool, that dropped f35 and added f37. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 75383ba185..cc5d1ac4be 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 98c03dc13b..cabbf4edfc 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d200c7fc10..f44b005000 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3eb28cf2e..319a534c22 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa966e4009..a5ea0efc3b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -111,7 +111,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) @@ -161,12 +161,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-35", + generate_dockerfile("fedora-win32-cross", "fedora-37", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-35", + generate_dockerfile("fedora-win64-cross", "fedora-37", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu"))