From patchwork Tue Jan 10 17:39:06 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: 640854 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2836332pvb; Tue, 10 Jan 2023 09:49:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXtDcOEVkzgbdJPd/Ll2SKE9BO+HJ3sH4izFiPthoXV429OgfK6bQ3HBRTGZ6eelr+JefSoy X-Received: by 2002:a05:6102:3561:b0:3ce:d4b1:1bf3 with SMTP id bh1-20020a056102356100b003ced4b11bf3mr10213854vsb.12.1673372980288; Tue, 10 Jan 2023 09:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673372980; cv=none; d=google.com; s=arc-20160816; b=uiaCjx5QkdoYurkF28rtKrIDCT5R+IQFtZ6geo2oENQ3B8/UnhYnheR8EI6kNJE7xP c97UNKzOCYsn72x6k1Psitl73ynp6R2YEdxjQq+e/O1/9tgFM8SJIv9IohsCXp0hW7/K qWGsMMKZTjTEaShNFNvXVnstDSu+HvRcR8ef4VdrvGC5RjyIXMraTwSe8DMc54Yyxo+B zwYZfIo9R6FKgWvz/b09FS8LExsDhFgD1QFZ5XHnzxidbovcgEEbVI0TNaIXhyu+XX1m lexMsvR/wWKWBmN05iDuU2wzt8ppk8gn+vuctmaGK036rvM1vafH+4PeKqre9hPlfHdM +UWw== 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=V2rmMzjG//zI25264Y4peHM4NvTlbmisIxxXtGaSGp787yuDTEG9HIF7ttNjCioKGM F0BUiTowynmgJLWGgg1lI8UjiaVwRd+yP8b2piqEz1SFfjBysmyqB/ASbs5RZMExw9Vn bXaAyGetb5WebBYwc2AfqPGfyuPonIZ8EIDwC2c/KAG2dXgfyDyXwE5ffniP1skB5E/x SEQ7PTWpwqASlg3Z4+xup3Xoi22IDEykC2wkDDMC6HaFHmw8KlLI0k7ILheMTbjP6L0q psrjYKHKnaVoGJ98O23KC4DfHo8FZ8AOMN8EAr55bDSW4y9FhNitJqAUuZtE27qwQft8 +LYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qLniBV6x; 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 u13-20020a05620a430d00b006ff0d5b01a0si7096426qko.44.2023.01.10.09.49.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 09:49:40 -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=qLniBV6x; 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 1pFIb7-0003Xb-QR; Tue, 10 Jan 2023 12:39:41 -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 1pFIb3-0003Sf-KV for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:37 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIaz-0001Fo-Re for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:37 -0500 Received: by mail-wm1-x332.google.com with SMTP id m8-20020a05600c3b0800b003d96f801c48so12517538wms.0 for ; Tue, 10 Jan 2023 09:39:33 -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=qLniBV6x5L6mhsf5I4aqYvnw3JrANWc0Isci/4hxCkG2frOhYSbBmG8lAW0JFfH1yw BmK9VIkVEmn3ds6BwRhYUdFlQwZ/GAPxKh4TuJTXECTfagAdaEjdVjMmp2mThuWs4N+q 5B821BcpXagshFiFh4AdSbLC/3AJDTntm570BrI90aLXk3m91RU8cMuQOZ4voh5p4RYg ISU8DB2UQttg+jsi555jfVzeYW1ZQK7OOHQ2einxo1UsLGh5Enc2BVgbJYqwIO4USB1p OAZeZL9nA81u5/xLK0x1R6w2o4+rJwDkZP2r3UIJ3H3uZUFjXy5xtCw0leUQ+9wt7ImY IByg== 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=ZFV/6H6g+UE+fte9YUBPNjZDEvTcDjxe6MdfSb20XiDFBMwdoKP7TCHNSVE6PTx4Sv +CAvGilnBCWpsbqfQzLXLVuP3GNb122s49zhtw91uOsNGMddA3w/2o5u/DFwlSKmlThg Od7Q6dcuMOXWS9J3bQ50dM9P5uippFkSuyfhZLMGNZKbA6rGRgLtl2Q8xosNqtWz7uFn IpSTYZwe/RtKeen/fYdIo5PUMIFKTQcTH1kv6x3x0ZUvRPir2dqAH12RnWlnJ+WhMhDl NrAx4HIvhl6fz1oWaGOCv/8lwLCKQ+xM05yOpqKl0ejtesk4LU+SbT1gKeMnwlc3rK0K jWiQ== X-Gm-Message-State: AFqh2krtxBsGEz1r8IhfVuzpXK5ttQ9AHtu5BmDEp4ENnQSMQggugIwR 6UG7hD3XYFTuwlsYz4z5BYGrAw== X-Received: by 2002:a05:600c:1503:b0:3d0:8722:a145 with SMTP id b3-20020a05600c150300b003d08722a145mr48839355wmg.40.1673372372375; Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b003b4cba4ef71sm23492283wmb.41.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D39191FFC2; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 10/26] Update lcitool and fedora to 37 Date: Tue, 10 Jan 2023 17:39:06 +0000 Message-Id: <20230110173922.265055-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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 --- 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"))