From patchwork Tue Jan 24 18:01:02 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: 646034 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp339443pvb; Tue, 24 Jan 2023 10:04:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvvWfCQzAW9LtF9Qv97kru5S6UuA2GqZhO8SPEbbjkUtDo/uzKYYedndf/Pud2OyWvOMz/T X-Received: by 2002:ac8:70d1:0:b0:3b6:3b60:e6 with SMTP id g17-20020ac870d1000000b003b63b6000e6mr43457382qtp.62.1674583481866; Tue, 24 Jan 2023 10:04:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674583481; cv=none; d=google.com; s=arc-20160816; b=SnJs3ofOln4Sao1KBlOopf3yYsLwsobGgFVk3GTGnIiuU4Og7ba71uoDQV/TAQHbPI u7ta7gHmlgSg4RsvDPan4thbWtWiaoOs1+iWvYJo3/yzpsXnVSSmbL/6UrqaUNRIS/7n jUSLh2OhJStLSxOiEAu54J7i/ax95dABb53Uk2+ZaqjnwKsf/qqNdpeJCfkC7YBUHnpL FMQvmiE175725Je6kerdxwD81nknJ1SQstEkrVJYQOE9pC66gpKyO2lXdCaOcL7+PwO4 sumzFvhx8eEA7mEDPB/X2CaYbjXc046XTrd1QbAZTay6qLH1UqW9oo6Sh4uieyb3dBbK lL1g== 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=dEwYwHp6mGUaSLwm1aU8SoiK/lL25Qo/Eb9YOi5nj2Y=; b=ZYxaYGB70ZSMslMNJk04OO6OUxVzBe1HSlxuuDLo/kudoKunNGs7ZnNU7/OyIEHifk inhsIbkRAAXYRKmOII6JerH1GRT9SspG39nDqB2u82zaqOkygf0VtnMNlxqbaYzIeA8H dVHiE1Mlyz/xCJKeSSmNQB2PhdvBSHnCbd40yw53S5DUB+DWTqUBiw7AP2QIYfMrf/p9 4ZaDyvh9oCRePptjG3o3TDX0VzTzOhDFRBjq8ssm9btH723oZeZhJK/6PLN79s+1Yw98 SiOur0EN/hMX56GSnyc31+93L3xNEgcDBoUhaDVd5P4frhKmqBxpPBSips3bV02JkDRx TVTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TMkURU+o; 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 fc26-20020a05622a489a00b003b6392a38f3si2015874qtb.531.2023.01.24.10.04.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 10:04:41 -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=TMkURU+o; 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 1pKNcV-0001g9-Dg; Tue, 24 Jan 2023 13:02:07 -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 1pKNcF-0001aQ-KW for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:51 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKNc2-00066A-Dv for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:51 -0500 Received: by mail-wr1-x436.google.com with SMTP id d14so11022570wrr.9 for ; Tue, 24 Jan 2023 10:01:36 -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=dEwYwHp6mGUaSLwm1aU8SoiK/lL25Qo/Eb9YOi5nj2Y=; b=TMkURU+orR1JgW90HIDHBpQtI91I4BXls4KH4dDtFrfMfOHCEN4dIwxHTTpj85awpD IrQkKBV47fw7hM0fPEQqb2jZZcgA9CcB0e8qu2hY2yyNwCASC8/KuPUylZPB+j7cUzgp iu/mS+vzRzJKx48cvSd92tzR30oN6MGsqvSRKiSz6WTllg0Qt940YKZ5IRqurDK91t45 tSvUUxP849Fqaa6snbSTsojKsSNO6kr52jEiVU+JKaU4E3L+MMTFeuFM5rjfJiKpapDZ f7WbJw/gy1gE9CU+XPVSUM31lvTQX5O2WDH/+X3G6YD+qg/nOWHhDVVTBlKZVEzio9Bg SRtw== 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=dEwYwHp6mGUaSLwm1aU8SoiK/lL25Qo/Eb9YOi5nj2Y=; b=Ax+mz2Tp1J8l2EZgASMsQ7dDdwaEkO3t8z2uwz72oG0Gjg/bhLz3oS+b/KVHfPnsSC eVy0gTL2miBOpSFjxsdsP9nFVsIyKr1+B7zsUZs/Q9Gc/+OfNsr9Kf6nTpLTsAWd87ez cBadknK+kpGNVN/7wXJOTuKoDGM4Fs7tECkhtAvEQFf8eaYl6SeAfUlxF0UNWRRJ5zMc pxt9KjVamvasmCny4RoZqnmgGfHcvCiG2aaA0hFvdabcH8Uq+QlwUCwd9wKNCbnuk9hL gPi/a6X4M5E2i5dg7ajWLWK07Uf5clev0sKForD4NU76j/IsEolIl6MThLFqfgR7onvV TEPw== X-Gm-Message-State: AFqh2komvJ4X81jdd3DDei8csQsIK3VCNMnmpWFq6V30bQJnVWzHBgma MRLnXGeIG0dCEQcndQrSfDZveg== X-Received: by 2002:a5d:4c91:0:b0:2be:3a68:2cfe with SMTP id z17-20020a5d4c91000000b002be3a682cfemr18875356wrs.24.1674583295174; Tue, 24 Jan 2023 10:01:35 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m14-20020adffa0e000000b00287da7ee033sm2468392wrr.46.2023.01.24.10.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:01:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A425D1FFC2; Tue, 24 Jan 2023 18:01:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell Subject: [PATCH v2 10/35] Update lcitool and fedora to 37 Date: Tue, 24 Jan 2023 18:01:02 +0000 Message-Id: <20230124180127.1881110-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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 Reviewed-by: Philippe Mathieu-Daudé 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"))