From patchwork Fri Apr 26 15:39:36 2024 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: 792344 Delivered-To: patch@linaro.org Received: by 2002:adf:cc13:0:b0:346:15ad:a2a with SMTP id x19csp519443wrh; Fri, 26 Apr 2024 08:40:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3IXrNEMUkusr3wd48/9hvcL36JTpcqQOy6QAMI6IwR2/APCLnxuxmV0G8A6AgOu/I9y9ksqEdsk/uMGG2U37C X-Google-Smtp-Source: AGHT+IHO72jGPPP1vgKZHvRA7JM6g/W6DqCfb9z6V+SjuSsH8WzyeGOWtuqVSq/IfoIe5G87+Qr6 X-Received: by 2002:ac8:5942:0:b0:43a:4e77:5a35 with SMTP id 2-20020ac85942000000b0043a4e775a35mr3380543qtz.22.1714146043984; Fri, 26 Apr 2024 08:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714146043; cv=none; d=google.com; s=arc-20160816; b=AzvCo1IfDjOWHmfBRaXFkziAhhrCYhmM11LkhyBkxFB4lMkH97mWPd83FUhoLCCKke I4HbA0tRbXBirqc7CIjQ9hkxj3/PfdonFWbun+Ebr9+vr//7HH18tIHdB/RkKbJM5cUr bkeRk3/ZwdNPLjWbpx9PaYss5OQplAc5Zq/WD4MkC1jphLWDelyPZUsSPX0J03DVbi3c b8IS8FEyfBOXXSeYSv6vhawMmbdrH4q326FjZVQM2fbmrTFiCZgBohGtoVMViDLtXa/K B8YYKVyeM1+uvmDdfo5fTgRffInLtFXgiEW3pT5PPcTRLwiD3z9NdcX+1+lmVqYM1GRu n/jw== 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=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; fh=cUCvLNMXPHEluP5si4NsLb28ZCku1lMHElvyfIucKSQ=; b=YZGDwl4qJW/Szj0e5k8b7cX9W7T0CrkwqEGDERUqV6wtpbebNymEMZkWKZ5emUWoVv /6VCROVhbtZJj3gWqE0/lrTgk1BLJ2Six6gwA0XHQEFO1dFswYEyut5EHIev4gnXT8Rm +R2cu+1he6G3vqjd9XXG0Zksr6chB2GYAd3Knr2Z1J9q4uBZ9P3dUfd1vgKfkZKW2xE6 Mt+agYM53/ePkZaaqYx09EYi2KKYcodWbX/SwITRVrqgOYr6iHPN10GPh58PPHWQMnpe rFuh/F11lkmc5A1bDoCoFrXZgWMayl/PhvTDDQgYRTc769U4odnv2bWdHEgvXF/haE9G +82A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g92x21Zf; 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 c12-20020a05622a058c00b0043592187a1dsi21031594qtb.423.2024.04.26.08.40.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Apr 2024 08:40:43 -0700 (PDT) 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=g92x21Zf; 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 1s0Nfw-0001pI-EF; Fri, 26 Apr 2024 11:39:48 -0400 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 1s0Nft-0001nT-L5 for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:45 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0Nfq-0003n6-J3 for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:45 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-56e6a1edecfso3616372a12.1 for ; Fri, 26 Apr 2024 08:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714145980; x=1714750780; 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=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; b=g92x21ZfL9Ij7Uh2MaCE/tq6GNuRnwcL8UBrSSuvSMYKWmTwgeOZEtA82Fg/Pz7V+c zi+M+lDAOO07sr+amFA1OVr3uPKcdSvb2MBqKQERBubLBU9MKV2N+zDemci+pKyeS0er bsCxQA7Ly0jYod4vPDPDztXvKNXuAE7+nfk+tEjNpL33+7VNuUmJsEEeiDRUBho0eZ3c FhNRNZ/T8dCgOST86xGQGdu9BW3+FJwO7QBHiRSlMqG+s91vyxjDm/5WzHGWGWFCd2YO TZOQjJY+/KRue+/IK9eAMApTINiXEqjRxCb7gs7JWkV33Fd28rx2lBPJtmCC7OrVoL9G 9hQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714145980; x=1714750780; 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=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; b=uqLgUuNdAOHUzBgRYylErUnMNE3+PzDFAAoCGdWUdsa18ez3cmYdXVISycQlZ9NWwG 9hryu+YmAU4/mOUHQbNPkoIXVsNm8ng5HnyrMqf5nnfPZB9cAgzgsUAdWpGY/cgVRp9x qASh+C6qAVfDBoikspsr4Su1HsClpcNdipuCjMw5xMuxd62AMblnWFFH/aMbSAGXCJ8E 2wU54p+XSwEhUuqcd1LtLiffLkgnGCFfKuW2YbWXe4j0oMLABBtrb63Akn50RNldbWJX sx2/RU2wmfHKSNbvzTLQM2VzswM1wbwGW2Sb35dc1D7nlTHSI7bI5IplgyHTGlceHXET 7hmQ== X-Gm-Message-State: AOJu0YwRgdg7fRkIHSuextNieFRVfFrrSL+dAmrkzxG3Ws5xLeQHcHmU uMnDh8yCMtnEeWBddvQCoL5lum685aE2fcSpQLNlGYeuahTZoURxhey7cqScaV4= X-Received: by 2002:a50:8d1e:0:b0:56c:3b7a:632b with SMTP id s30-20020a508d1e000000b0056c3b7a632bmr2203670eds.29.1714145979910; Fri, 26 Apr 2024 08:39:39 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y43-20020a50bb2e000000b0057000a2cb5bsm10547038ede.18.2024.04.26.08.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 08:39:39 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0670E5F8A9; Fri, 26 Apr 2024 16:39:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Beraldo Leal , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Mark Cave-Ayland , Joel Stanley , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Pavel Dovgalyuk , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Aurelien Jarno , Jiaxun Yang , Markus Armbruster Subject: [PATCH 1/3] build-environment: make some packages optional Date: Fri, 26 Apr 2024 16:39:36 +0100 Message-Id: <20240426153938.1707723-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240426153938.1707723-1-alex.bennee@linaro.org> References: <20240426153938.1707723-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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=unavailable 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 Upgrading the s390x runner exposed some packages are not available for it. Add an additional optional stage we only enable for arm64/x86_64 for now. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- scripts/ci/setup/build-environment.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index f344d1a850..de0d866a1e 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -95,7 +95,6 @@ - libpam0g-dev - libpcre2-dev - libpixman-1-dev - - libpmem-dev - libpng-dev - libpulse-dev - librbd-dev @@ -107,7 +106,6 @@ - libslirp-dev - libsnappy-dev - libspice-protocol-dev - - libspice-server-dev - libssh-dev - libsystemd-dev - libtasn1-6-dev @@ -119,7 +117,6 @@ - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev - - libxen-dev - libxml2-dev - libzstd-dev - llvm @@ -156,6 +153,19 @@ - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '22.04' + # not all packages are available for all architectures + - name: Install additional packages to build QEMU on Ubuntu 22.04 + package: + name: + - libpmem-dev + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '22.04' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' + - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04 package: name: