From patchwork Thu Jun 6 11:50:47 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: 801989 Delivered-To: patch@linaro.org Received: by 2002:adf:f147:0:b0:35b:5a80:51b4 with SMTP id y7csp254805wro; Thu, 6 Jun 2024 04:51:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWglPwgrRWXV6vS1jpNkuzoaMdg3M7FPCZh7wZqApPMfR4ZcsEQq9yG0Q0WGGKPMI0U+mXa4dvqgbUiSohavd+8 X-Google-Smtp-Source: AGHT+IF9exu7eCmBNdr6Hu63mZHitYb2QjfxkvDbz74Yc+XNmPx/MpSkhurfRabAlKZAL3fURzU0 X-Received: by 2002:a54:4486:0:b0:3c9:6f32:48ae with SMTP id 5614622812f47-3d20461acb6mr5259708b6e.47.1717674695180; Thu, 06 Jun 2024 04:51:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717674695; cv=none; d=google.com; s=arc-20160816; b=M5CbyabbAnP3s6J/IUC6Uso4a0sDKsd+ny658Xz+m3zn4KE8yqQ2JuENDqyJY6ajHW iP5e50KmJ0rMiswgqTv/30OcvbusFkDGqsrEQoR40+uRNko1VdTbiOpYKqi7Gqyqc3ZU 46bUWtY1Q4b8xMVCZqljnWPUoQQ1+ZcV5furJbWL6am99E6W9ZbsNfkFyKymjYCwhfR4 rlJtnl6VxQc+7gXO6pHV+ngrJ7UcVC8dOiVaIuU61PR/VQPJsXyfEYY8eJ3x1Mkw3Tek YNg10tpPPK0jSea4e5LUMIfV6WdmwzxTKq9PAOJte21WYmnC/1hBkvevGxUBtbIBPA6Y kZag== 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=HEiaO79EnHcFSWKjr05NL64y0sp0/W9PFgORRJ4kV5Q=; fh=jUpKE2xnxMsyN0/pv376xeAx2+NoX7ZpLKTmYHVHrxk=; b=aqtQDBHGU4N+WXEhemifOAco481oKgo/tXaHHuHZAnC7R6uA9ATQWSFIsBuCBSvzhs /afQLsq5wBUgXc0Ym8Lh91edn+USfVdwdh5OXvAEe6xxNIMkWR114jxisxvQo7UxpYn0 yv4t9D5fbyDEgz3tQEh0TCP8jSE1ucbvB/hspD0vzXAbWsjzwDLlG1ygRpHQBOimQulc cPvZY1vFeEvU6YktYj4BvcMoTXkxlkLGzHDvB6dh/lAaCB1x6Jv9DzxY2lwIC4f+m26P PqzSJJKsWIkXf+CaFg1GtINQjo72nEe1rMWqu7GLGLoqs8dSH8yHxCOOsybqDK4AaF+2 Jb+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MGN0z1GE; 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 af79cd13be357-795331d2e85si130191485a.237.2024.06.06.04.51.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Jun 2024 04:51:35 -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=MGN0z1GE; 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 1sFBe4-0007mQ-By; Thu, 06 Jun 2024 07:51:04 -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 1sFBe3-0007le-CZ for qemu-devel@nongnu.org; Thu, 06 Jun 2024 07:51:03 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sFBe0-0000tc-ES for qemu-devel@nongnu.org; Thu, 06 Jun 2024 07:51:03 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-57a2ed9af7dso1229349a12.1 for ; Thu, 06 Jun 2024 04:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717674658; x=1718279458; 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=HEiaO79EnHcFSWKjr05NL64y0sp0/W9PFgORRJ4kV5Q=; b=MGN0z1GECs09TirsXeNl7t807yhwrJjHbYrmrBnpopkC1d4xhxFkmFk90KC5sb4lSe RaPXpSH1YjyyVX5y5iKJSecGuNf3L69nbUnalzp3kDPQYZHGcF849afirPStdMthO9gm nT5/RLCxCi4oRly8oipKoLve4N56B5xwUI46lL09gcd4wHXVc2moKeTHYgsa9HxBSWEJ FViQAnegTcD11mfJ1QFaBydQDaRtmnmej8JoLoYffG6A//m3Ep8i4AJPuPbvYYMpoRgY LUEdF9ywXYVHZaM9LmIpACh2vARffJ+0xuCKJWj0rkBRYLexYVV/pgOtaopALp3nCpj0 SD5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717674658; x=1718279458; 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=HEiaO79EnHcFSWKjr05NL64y0sp0/W9PFgORRJ4kV5Q=; b=fwlwfucCEc5y0U9DaOuoaJW15Uhb/xkVQdgEi//JPkFLP/aUeZZRwRoJ7ehHNlrh9v kSOEC4Oz9KuZo1YPrBFL9PSS7eMS3SNShDWAvt96SVR45jvt98jtBJ7WDJhZkx3RcNz5 FRv9742Uf4CFsqf7ywqZmFIn9PvMOm/45vzRWYA/9xRaj7utusC8hRZB910lJe7pXDmJ 1JcQYkEqGZCxbEwyDVnRToqgrOU98tUljIMvmdudPcDnt67bl061rheY2Bp1nz6ZjgyX 9x6KhyapdnzVSPa/V7giHIaLe+tY4J60tKYqhtzvMfivhfZcqKguIDcBv1LN8z2QbbqI SfXg== X-Gm-Message-State: AOJu0YzHA91qiITwzLjDn5vCoj8fLCrri20h7x8Qk+FIEw8LEzQ2c7n/ 1gm1sy+hj4PXK0kMw61Wm6DZcMAvnyzGhYPDnrZ2xIcp0O2qsCc1VRmZSLXTUK8= X-Received: by 2002:a50:8e45:0:b0:578:6410:1d50 with SMTP id 4fb4d7f45d1cf-57a8bc912abmr4241181a12.34.1717674657759; Thu, 06 Jun 2024 04:50:57 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57aae12ce21sm971618a12.49.2024.06.06.04.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 04:50:52 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 147345FA2E; Thu, 6 Jun 2024 12:50:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 12/12] scripts/ci: drive ubuntu/build-environment.yml from lcitool Date: Thu, 6 Jun 2024 12:50:47 +0100 Message-Id: <20240606115047.421045-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606115047.421045-1-alex.bennee@linaro.org> References: <20240606115047.421045-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.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 Now lcitool can write the package list for us we no longer need to duplicate the information directly in build-environment. Signed-off-by: Alex Bennée Message-Id: <20240603175328.3823123-13-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml index e82097b465..edf1900b3e 100644 --- a/scripts/ci/setup/ubuntu/build-environment.yml +++ b/scripts/ci/setup/ubuntu/build-environment.yml @@ -32,135 +32,18 @@ when: - ansible_facts['distribution'] == 'Ubuntu' - # lcitool variables -f json ubuntu-2204 qemu | jq -r '.pkgs[]' | xargs -n 1 echo "-" - - name: Install basic packages to build QEMU on Ubuntu 22.04 - package: - name: - - bash - - bc - - bison - - bsdextrautils - - bzip2 - - ca-certificates - - ccache - - clang - - dbus - - debianutils - - diffutils - - exuberant-ctags - - findutils - - flex - - g++ - - gcc - - gcovr - - genisoimage - - gettext - - git - - hostname - - libaio-dev - - libasan5 - - libasound2-dev - - libattr1-dev - - libbpf-dev - - libbrlapi-dev - - libbz2-dev - - libc6-dev - - libcacard-dev - - libcap-ng-dev - - libcapstone-dev - - libcmocka-dev - - libcurl4-gnutls-dev - - libdaxctl-dev - - libdrm-dev - - libepoxy-dev - - libfdt-dev - - libffi-dev - - libgbm-dev - - libgcrypt20-dev - - libglib2.0-dev - - libglusterfs-dev - - libgnutls28-dev - - libgtk-3-dev - - libibumad-dev - - libibverbs-dev - - libiscsi-dev - - libjemalloc-dev - - libjpeg-turbo8-dev - - libjson-c-dev - - liblttng-ust-dev - - liblzo2-dev - - libncursesw5-dev - - libnfs-dev - - libnuma-dev - - libpam0g-dev - - libpcre2-dev - - libpixman-1-dev - - libpng-dev - - libpulse-dev - - librbd-dev - - librdmacm-dev - - libsasl2-dev - - libsdl2-dev - - libsdl2-image-dev - - libseccomp-dev - - libslirp-dev - - libsnappy-dev - - libspice-protocol-dev - - libssh-dev - - libsystemd-dev - - libtasn1-6-dev - - libubsan1 - - libudev-dev - - liburing-dev - - libusb-1.0-0-dev - - libusbredirhost-dev - - libvdeplug-dev - - libvirglrenderer-dev - - libvte-2.91-dev - - libxml2-dev - - libzstd-dev - - llvm - - locales - - make - - meson - - multipath-tools - - ncat - - nettle-dev - - ninja-build - - openssh-client - - pkgconf - - python3 - - python3-numpy - - python3-opencv - - python3-pillow - - python3-pip - - python3-sphinx - - python3-sphinx-rtd-theme - - python3-venv - - python3-yaml - - rpm2cpio - - sed - - sparse - - systemtap-sdt-dev - - tar - - tesseract-ocr - - tesseract-ocr-eng - - texinfo - - xfslibs-dev - - zlib1g-dev - state: present + # the package lists are updated by "make lcitool-refresh" + - name: Include package lists based on OS and architecture + include_vars: + file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml" when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '22.04' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' - # not all packages are available for all architectures - - name: Install additional packages to build QEMU on Ubuntu 22.04 + - name: Install packages for QEMU on Ubuntu 22.04 package: - name: - - libpmem-dev - - libspice-server-dev - - libxen-dev - state: present + name: "{{ packages }}" when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '22.04'