From patchwork Wed Feb 21 08:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774501 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp304769wrw; Wed, 21 Feb 2024 07:20:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWyuT5Ii+bRy1v0iOf0LS2jI/lLCtjQE1Rficp9FEkZDVODfA19xXT7mDNB5KYv8Tyh1s/bgodAWqS2zirHhnzX X-Google-Smtp-Source: AGHT+IEXxMO2cep6NkqWBlBtDxks7vhWNcNdfSIKjKt4Hhid8rVHmMJvnoKJIQeJ9fMWuqYsWZMO X-Received: by 2002:a05:620a:16cd:b0:787:28c3:b323 with SMTP id a13-20020a05620a16cd00b0078728c3b323mr20472532qkn.62.1708528829459; Wed, 21 Feb 2024 07:20:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708528829; cv=none; d=google.com; s=arc-20160816; b=fntS8o+PKyaaAHcQ5GYIPnIUn37i9sdmILWTrzkQw3gata99HFowW5wJy4osJ5mNuj WLQ24KNpGOIP3x0SQmocf42tCny2B/CaXGmELAd5VB3etL0pSHj/lFCc2aRhaO3Wtq4q cy2y2g8GbKu0ijrMxJnnTirhKYY+UAIZPLRhdg/aSDoLTudL+9dIKjPkRgyPaqKyDukc wylaeMFb8rvMCJUAo+e5SjkxQGuyO2FuMSiot8ouyRFfWLWIRHv3n7l5TcNFk8nnrKma cJXhAUfOirB23y3zrhIqyPhtr7uH+q4kCYeZ6qwrJpVXnBBkhP/jfsbM0QCR921k1o+J eJ4A== 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; bh=VYCQW4lfuQycqhfN2r4o2OTDNs/mszfaJoFNQJnZruM=; fh=He0A/96iGS/hdBTIvTFKPoE7yByjlEm52ubAJxr7bqo=; b=Xq7Zr77ZV2KUTWPBA/QHfKOXLoQ6zu8eLIQemMxSWW7Xx3FKE2NxqKWta3TTWn+UGU Fwo0v5aqnjshA3mcAVMlaiZstBGA9KWCWeXRRR6g17rRQUQ238fxIT+VUqtYx1etU+zL KV1LU1bbp3mK5y3SCJnJj99Ph8ZcyG0w99zlQImjhHYVDSP9+NMVJQ+MbfUrkJ7o+T9Z p3Mn+C51awkE7WBvI4Mp/Stow3XaL/AK+twBSiUHpE4lWlunmotrNUHMRpmbn2iylOb/ xITVXfOYto2ldxgNZmFRQ3TSo1K2Kd6Lp+oOCDynwE/jfopkZUfVaVPtqe++7b7dxfTH YWaw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p14-20020a05620a22ee00b00787273e4b87si10320118qki.711.2024.02.21.07.20.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 07:20:29 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcoOQ-0001we-P5; Wed, 21 Feb 2024 10:20:18 -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 1rcoKw-0000wk-BN; Wed, 21 Feb 2024 10:16:43 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rchuv-00031M-Pt; Wed, 21 Feb 2024 03:25:27 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 322174F3EE; Wed, 21 Feb 2024 11:21:23 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id F1495860CD; Wed, 21 Feb 2024 11:21:01 +0300 (MSK) Received: (nullmailer pid 2142134 invoked by uid 1000); Wed, 21 Feb 2024 08:20:58 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.2 48/60] .gitlab-ci/windows.yml: Don't install libusb or spice packages on 32-bit Date: Wed, 21 Feb 2024 11:20:36 +0300 Message-Id: <20240221082058.2141850-48-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Peter Maydell When msys2 updated their libusb packages to libusb 1.0.27, they dropped support for building them for mingw32, leaving only mingw64 packages. This broke our CI job, as the 'pacman' package install now fails with: error: target not found: mingw-w64-i686-libusb error: target not found: mingw-w64-i686-usbredir (both these binary packages are from the libusb source package). Similarly, spice is now 64-bit only: error: target not found: mingw-w64-i686-spice Fix this by dropping these packages from the list we install for our msys2-32bit build. We do this with a simple mechanism for the msys2-64bit and msys2-32bit jobs to specify a list of extra packages to install on top of the common ones we install for both jobs. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2160 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Message-id: 20240215155009.2422335-1-peter.maydell@linaro.org (cherry picked from commit 8e31b744fdf2c5d933681e4128acee72a83af4b8) Signed-off-by: Michael Tokarev diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index f7645f72b7..5c1e385dc8 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -88,7 +88,6 @@ $MINGW_TARGET-libpng $MINGW_TARGET-libssh $MINGW_TARGET-libtasn1 - $MINGW_TARGET-libusb $MINGW_TARGET-lzo2 $MINGW_TARGET-nettle $MINGW_TARGET-ninja @@ -98,9 +97,8 @@ $MINGW_TARGET-SDL2 $MINGW_TARGET-SDL2_image $MINGW_TARGET-snappy - $MINGW_TARGET-spice - $MINGW_TARGET-usbredir - $MINGW_TARGET-zstd " + $MINGW_TARGET-zstd + $EXTRA_PACKAGES " - Write-Output "Running build at $(Get-Date -Format u)" - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink @@ -123,6 +121,8 @@ msys2-64bit: variables: MINGW_TARGET: mingw-w64-x86_64 MSYSTEM: MINGW64 + # msys2 only ship these packages for 64-bit, not 32-bit + EXTRA_PACKAGES: $MINGW_TARGET-libusb $MINGW_TARGET-usbredir $MINGW_TARGET-spice # do not remove "--without-default-devices"! # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" # changed to compile QEMU with the --without-default-devices switch @@ -137,5 +137,6 @@ msys2-32bit: variables: MINGW_TARGET: mingw-w64-i686 MSYSTEM: MINGW32 + EXTRA_PACKAGES: CONFIGURE_ARGS: --target-list=ppc64-softmmu -Ddebug=false -Doptimization=0 TEST_ARGS: --no-suite qtest