From patchwork Thu Feb 22 13:09:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 774870 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp756379wrw; Thu, 22 Feb 2024 05:10:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWUOoOAjOVO8ENdG1Tn3kvocSoNWv2ZfbZm+quvTVm213kg0t2huGjSZsrPEsEUW8+znOiPf9uwCWj0zeBxl2UQ X-Google-Smtp-Source: AGHT+IHSXu5T+OPBz64N9Az8bFOkGIvFb8PvBLiXhJ1nPxVMkw/eDWf1+3ZbHcq4taqJUFiE4Uuv X-Received: by 2002:a81:b71b:0:b0:604:3ee2:f258 with SMTP id v27-20020a81b71b000000b006043ee2f258mr19274189ywh.45.1708607443364; Thu, 22 Feb 2024 05:10:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708607443; cv=none; d=google.com; s=arc-20160816; b=cIbbwlLQ/Btausj1GnLxCep94jk5+AbGD+Z9cSt/mR3Q0cDX7E18GUNWP1T4iIPMfK WqH7gzsSuLaSMoQvG4cbgsFInZW72OhaEpVWsLZBSgO2BZHm+QQmqOo61ZDIdxRSK/Wq xZYvk6tgIn6LCPGuC03fYi+nKQY4dmI8dTRDm2Ywua6cPouIO86v+Eg1/FE31fKBOAkG yLeDZDC41o5f0nBZB/68DcldNB6+u4w6CpfF5iiMZ9e1Hthcajh7yd4kiSD4jJYwh+xv nsFA5Z4GcwynN42z+UJdcwxXoPKtZJZryNGSG9a4vkr+5SNzv51rbVY4O3Qu8UcvC/Mm BgsA== 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=RnCt6fdK36sx97DRsBiESjUyzzLQCMGvK0N+iheQc9c=; fh=Jv+ySR4QiiQ/DVyn/PTOp7s/ItXZhMwBT3DzynQUJaI=; b=agXtCc7dYqmbMT6Dcp5lt/v/L9yRbrQhliLBL9tgVyjEnMopr4hZJEsge9yrMd1Orh KkDcJJgKxF7sayJa9lZbd9JlgA/mipiUKr5wrZh+GML7xxQ/6PER4gKsesPS2FYrS4Hp yLaBMISFoAsh7ZzNeixOiFag40ud0Z/G5BakPbNcF5wFKX7qrya9ZKRu5QQZGSuLNbne /e2Es9kGVk9M5NW9UjO1JtSeuOuf+sThgSsFISCC4/jnJ8igKTkisqX7MbWN7lbE7hxn PIKYMUhaRGK024/ZDPn1A0GVbrESkI2qFaOnnY6h2NMuh8x7U9jeMcVyvoWD5MdrmsSV M8tw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ItK4RiOm; 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 d14-20020ac847ce000000b0042e28732f28si5534249qtr.352.2024.02.22.05.10.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 05:10:43 -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=ItK4RiOm; 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 1rd8pR-00010y-NN; Thu, 22 Feb 2024 08:09:33 -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 1rd8pL-0000tp-S1 for qemu-devel@nongnu.org; Thu, 22 Feb 2024 08:09:27 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rd8pI-000879-QU for qemu-devel@nongnu.org; Thu, 22 Feb 2024 08:09:27 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-412897a2f9eso2875315e9.1 for ; Thu, 22 Feb 2024 05:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708607363; x=1709212163; darn=nongnu.org; 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=RnCt6fdK36sx97DRsBiESjUyzzLQCMGvK0N+iheQc9c=; b=ItK4RiOmhM9INSVyHJAP/Ij9VCLXFOwg5jl0yFR9VAqSZPwIocnkF38bDjs1u4zvqN zL/5fsBLN8jGqvwk5sOOTvaVUHLgO0nXMVRUN9d6O3QpxqmVKLMXn5ogt7smdbOufCWA aFCS/2JhH0mzxZyFPmIRr/Q6mTOO8xkfvIy92Zw9yETeU8cXEInQqS5Yf2U0NyWqCD9z mb3n/gifU0n1P/yoXi6tulG+it8w8i9e7rJZjzyXRWFI4IU1Evo+RSXw54bshE7SNdeZ qPBNyE1P9Sl+XLg6PbYmPofASpDxIXRQwy0Nfy9110PyAinSnakzoSOE+vQbkJ9vUn04 M0Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708607363; x=1709212163; 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=RnCt6fdK36sx97DRsBiESjUyzzLQCMGvK0N+iheQc9c=; b=TkIax3Tltw2eJfkRVhlIY1bIlMzuYW+U/A83g+TuYQewt2ftV6kXTwXcuVvnSO8LFC t8XHy6H2WiKelKz6JBA5ojtLcqkVwmvT/r1aANvSm4568PEt/4gdks27oj+vX1THz90Q 8bMxrHpACBpVdNpEPSH969C2NTD8o6RTsNZMzZSU7yAaJaAAFHGvzgMKamoz6hNXbrQ2 sVA6z+qxc96tQbQFuFGoKW7mwgJFcepm0zmx85k8D0fTnK7Gd18BczwnRMqViNjR5rie ZLZNBlm4QIzP5TzJQtqIrZiEYib4l89Fkp/kyDM/fp59wvzaMyzQUC6Lovc+uRDRKEnv T8MQ== X-Gm-Message-State: AOJu0YzuVAFvUHAdO1GRSaBVpBjmCsV22IENVWWGkDgahjHkQv6UKVlT R+B3tvpTeO79C4OMBoKoQ9ZX8XuCdqAHWMQpaq36mm4XMTM271uTWGsR1v3uOtI8t7MyGqlZIEd L X-Received: by 2002:a05:600c:1da4:b0:412:5a8f:3dd7 with SMTP id p36-20020a05600c1da400b004125a8f3dd7mr2594065wms.5.1708607363171; Thu, 22 Feb 2024 05:09:23 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f19-20020a05600c155300b00411ff030f06sm22434458wmg.9.2024.02.22.05.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 05:09:22 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_?= =?utf-8?q?P=2E_Berrang=C3=A9?= , Thomas Huth , Yonggang Luo Subject: [PATCH v2 2/3] .gitlab-ci.d: Drop cross-win32-system job Date: Thu, 22 Feb 2024 13:09:19 +0000 Message-Id: <20240222130920.362517-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222130920.362517-1-peter.maydell@linaro.org> References: <20240222130920.362517-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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, T_SCC_BODY_TEXT_LINE=-0.01 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 We don't support 32-bit Windows any more, so we don't need to defend it with this CI job. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Reviewed-by: Alex Bennée --- .gitlab-ci.d/container-cross.yml | 5 - .gitlab-ci.d/crossbuilds.yml | 14 --- .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ tests/lcitool/refresh | 5 - 4 files changed, 135 deletions(-) delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 8d235cbea01..e3103940a0e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -101,11 +101,6 @@ cris-fedora-cross-container: variables: NAME: fedora-cris-cross -win32-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win32-cross - win64-fedora-cross-container: extends: .container_job_template variables: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index d19d98cde05..987ba9694ba 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: IMAGE: debian-mips64el-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu -cross-win32-system: - extends: .cross_system_build_job - needs: - job: win32-fedora-cross-container - variables: - IMAGE: fedora-win32-cross - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu - microblazeel-softmmu mips64el-softmmu nios2-softmmu - artifacts: - when: on_success - paths: - - build/qemu-setup*.exe - cross-win64-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker deleted file mode 100644 index 08799219f98..00000000000 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ /dev/null @@ -1,111 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch mingw32 fedora-38 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:38 - -RUN dnf install -y nosync && \ - printf '#!/bin/sh\n\ -if test -d /usr/lib64\n\ -then\n\ - export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ -else\n\ - export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ -fi\n\ -exec "$@"\n' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - bash \ - bc \ - bison \ - bzip2 \ - ca-certificates \ - ccache \ - ctags \ - dbus-daemon \ - diffutils \ - findutils \ - flex \ - gcc \ - gcovr \ - git \ - glib2-devel \ - glibc-langpack-en \ - hostname \ - llvm \ - make \ - meson \ - mtools \ - ninja-build \ - nmap-ncat \ - openssh-clients \ - pcre-static \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx_rtd_theme \ - sed \ - socat \ - sparse \ - spice-protocol \ - swtpm \ - tar \ - tesseract \ - tesseract-langpack-eng \ - util-linux \ - which \ - xorriso \ - zstd && \ - nosync dnf autoremove -y && \ - nosync dnf clean all -y - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" - -RUN nosync dnf install -y \ - mingw32-SDL2 \ - mingw32-SDL2_image \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-gcc \ - mingw32-gcc-c++ \ - mingw32-gettext \ - mingw32-glib2 \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libepoxy \ - mingw32-libgcrypt \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config && \ - 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-c++ && \ - 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-g++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc - -ENV ABI "i686-w64-mingw32" -ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- -ENV DEF_TARGET_LIST i386-softmmu -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 0c93557ad67..fe7692c5006 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -192,11 +192,6 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-38", - cross="mingw32", - trailer=cross_build("i686-w64-mingw32-", - "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-38", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-",