From nobody Sat May 18 15:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674145998; cv=none; d=zohomail.com; s=zohoarc; b=Xus0aghmIbVid2OCjcnSsmKJZRCFb/NbJ7xUbsYx5xVTieqhnIPB7+rlXz9zRh05sNpY8RUPOK3ezKgUbDWPd1oMeQ4YUvEEXZtE2RdAhWySXlnjAdOElPXLqowp8c6RD0GY5keakMATyMKNxFMQm/AY5pMhlBkHXY7inIXrHeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674145998; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P8TJC+6KTSfqQFuYTIVlMWRtQxJ3Jh97cuo8zl5mC0g=; b=GqHr6DR0iPq+0WaFjqAftDju2wq69nb3PB9SFINaNRZrwrVQHqWrwQxwQXUfwKjJ5WltabcZdljdvELBAe00oSSH8NCcx86eH5jyF4AmEMGewryW27sx3VNvVVsllD/0a+1PuLgpUIF0RnM5xBcPHAhkzxjcbDBgABUpPp89dSk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674145998100690.5645117715239; Thu, 19 Jan 2023 08:33:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIX39-0008UT-OV; Thu, 19 Jan 2023 10:41:59 -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 1pIX38-0008UE-D9 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:41:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIX36-0005rJ-Uu for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:41:58 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-299-MmZrc5DiN7-gpMMSxppEEg-1; Thu, 19 Jan 2023 10:41:52 -0500 Received: by mail-ej1-f72.google.com with SMTP id gn31-20020a1709070d1f00b0087024adbba2so1877140ejc.20 for ; Thu, 19 Jan 2023 07:41:52 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id gj19-20020a170907741300b0085e05b4f815sm11277660ejc.95.2023.01.19.07.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:41:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674142915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P8TJC+6KTSfqQFuYTIVlMWRtQxJ3Jh97cuo8zl5mC0g=; b=W34Ye8stXcnpa2XHy+0ccqPXmDmAl9W7KrbXplobEBlDcsqEz9OFrqPSJ9H/B+TblwNU5p ERo8ZMrqkSaseyHolhqtShUJpIuxY84iqj7BZ9Wfeg4b+nmpupTN1QWqGtCPCjYhNRYbcY wxovKZ3cGwYa7kheGORw5f3D7uTeWN4= X-MC-Unique: MmZrc5DiN7-gpMMSxppEEg-1 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=P8TJC+6KTSfqQFuYTIVlMWRtQxJ3Jh97cuo8zl5mC0g=; b=J5K/6g5aXdDX/V/OvFQGfjG9byeSSdWYqLv4InQNnuoQAKBrbciDWWvIrWeFQWvJbU ZT1WvDc31sxGSlUfB6DvbKeOT7Qrwl4M6Ck6Cd/PCpcMivBI7RroMelf3fEtvLeLFMjR YoxzqRMrcbU+qrKeJc5ofwj9VUS8f+3jTHUqL4FcnfoZqg4uUI4gloHtIDr3bI0azKIG TTWBaKGX8qaGrkeTRLLx2qZ0fOYbi4naMI8eByveuPilgQorFM8mODo4NXnAOLFp40Xq 04Y6N+1wUCZ3QvXtLVM6w26q0WzSm7f7r83EwxIg4duaH+tpPj2r9qz3fj1SVFItvOu5 e1rg== X-Gm-Message-State: AFqh2krfr/TidaB5yfsN57lJsAQ+Ma6nh/DeFQJAl/ZZGVqJ5i1zn8RB jpi0dsrFPJ7YGWB//dwgJxP4iTc+sGYx7nqHGgzCf/a7xJN/LVFuwfbJscorho1JH3G++RnyYph sr0lUDCQ/2ucIcaEk9YMuP3KzRqAKJA/R23/a2foqAo0q7eXWhqfoSUCqbFLlCfzIgC4= X-Received: by 2002:a17:907:2b01:b0:877:6e09:468d with SMTP id gc1-20020a1709072b0100b008776e09468dmr3048491ejc.7.1674142910747; Thu, 19 Jan 2023 07:41:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXtVVddGi8msuvgnfXvpB8tf3bLefyvr3fzwUKK5+PwcVMjnrgtTvc29O0pJvQF6kWWIxGbOFg== X-Received: by 2002:a17:907:2b01:b0:877:6e09:468d with SMTP id gc1-20020a1709072b0100b008776e09468dmr3048477ejc.7.1674142910534; Thu, 19 Jan 2023 07:41:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: crosa@redhat.com Subject: [PATCH 1/5] scripts/ci: remove unnecessary checks from CentOS playbook Date: Thu, 19 Jan 2023 16:41:41 +0100 Message-Id: <20230119154145.471156-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com> References: <20230119154145.471156-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674145999667100003 Content-Type: text/plain; charset="utf-8" The playbook is meant for a CentOS 8 install and is already checking /etc/redhat-release. Simplify it by checking only the result of the "extra check" rather than the Ansible facts dictionary. Signed-off-by: Paolo Bonzini --- scripts/ci/org.centos/stream/8/build-environment.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts= /ci/org.centos/stream/8/build-environment.yml index 42b0471634c2..fe8807b7b074 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -17,8 +17,6 @@ option: enabled value: "1" when: - - ansible_facts['distribution'] =3D=3D 'CentOS' - - ansible_facts['distribution_major_version'] =3D=3D '8' - centos_stream_8 =20 - name: Install basic packages to build QEMU on CentOS Stream 8 @@ -46,6 +44,4 @@ - systemd-devel state: present when: - - ansible_facts['distribution'] =3D=3D 'CentOS' - - ansible_facts['distribution_major_version'] =3D=3D '8' - centos_stream_8 --=20 2.38.1 From nobody Sat May 18 15:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674146149; cv=none; d=zohomail.com; s=zohoarc; b=TPKGuh90wtZ8G3dohBcrhstbMyztpdKCJQQ5JIciJExMzMXfLowrZgBkGe6sVhA4Nd600GXkHp2XGMDOLu1y0GStuYVeq9j53OxnRdWrb8Sb2fiu4HtF9jTBS8q9es2fhTgUN8KN3lUuQ/6ZjqtjDX+g2zhfSjTayfbeX9S+guo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674146149; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wAyRNRZijRpyQ0dRMa1PjUN2o0me4CYdHHtAmZmNw+A=; b=Zr66uRUVQhiNYb7NBV9c9jHPCIDRElabTF0egajIZjOcCKAWvA/a5k3FfMAWabRWe2qitswj1YFWsSopluZjE3K5OTAIPxB+WvxDyKsWIDy9nhtuvonPNVtm2JQ/CJnjGVNddmgyXVsj9sLKnO2/LwPpTo1h+oc+AxdJIdUXm+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16741461492211008.7605405758072; Thu, 19 Jan 2023 08:35:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIX3E-00006n-Uj; Thu, 19 Jan 2023 10:42:04 -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 1pIX39-0008US-Ns for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:41:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIX37-0005rP-AD for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:41:59 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-41-0fbwxTwpNUGISFJUWDFSyw-1; Thu, 19 Jan 2023 10:41:55 -0500 Received: by mail-ej1-f72.google.com with SMTP id hp2-20020a1709073e0200b0084d47e3fe82so1862309ejc.8 for ; Thu, 19 Jan 2023 07:41:54 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id k11-20020a1709062a4b00b0073022b796a7sm16769025eje.93.2023.01.19.07.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674142916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wAyRNRZijRpyQ0dRMa1PjUN2o0me4CYdHHtAmZmNw+A=; b=c38zOiovzbIIxYfqn+8al2lk0gWmVdkg40qJGjRpEyWwuNaXYRkH9ZWJG1MJ4I2od14JHZ eKKqtYP2l3j4bA8yF8NACsgOUafx99DB8LFEVZLpE3CTjUiL1rq7J74lhlEqg/H9fg77Zp gOyRailnqZJdTN0H+hdl8UoQxn3YUEw= X-MC-Unique: 0fbwxTwpNUGISFJUWDFSyw-1 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=wAyRNRZijRpyQ0dRMa1PjUN2o0me4CYdHHtAmZmNw+A=; b=xRETHzKpfcq8fAKS6CFcWJktusJj0JIGJFUITL5G+pf/sh9Qv0Yih0W1/C1bA+ksqc OzQai12y0ks3RVSKfzhRk/wrsCm/2/hzHQWdqDsHn6swkkIJBB7JECpI00tewTxQleza NwCg9RY6+E06yxGm15QCfPspaX6VBMt6APml/iW3hY7xbTxWrransVuwtZWulXtPCwN+ UxG5C+eKzb5es0tLrW6J6GDJMkp2nGU5GcUiuX+UjI3krC8RqGabH++R2PNyZ2iVKjgj 6Gk7TtFQ5fA31NBKIr9paBAH5/IE13PsffSdz5g2WthlOKg+Mzcp2JDyz5XGTilAh2Xq bV0g== X-Gm-Message-State: AFqh2kqPcfNkmMA3hzgOMJ3n3uzeICdy3LBIPgYWG1fqxPOu24ZRXRg8 rP/sLgTrhXwI8F7rU7HlpNfZaQpnVH+k8SJcFKV3ddtnzOUNoA7ovVMijsX4uEtTMUorWUdtvS7 8aUj3Ho0OhZNxvVBCKtw/zIdyCd6QTOBO1F6BgICxqUCSM1CfouBN4ZWjfJyYtTd8Eso= X-Received: by 2002:a17:906:3783:b0:86f:e116:295 with SMTP id n3-20020a170906378300b0086fe1160295mr14836235ejc.4.1674142913450; Thu, 19 Jan 2023 07:41:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXuPut1n4wXI2EWCVkVmo6bSDUfWozsUcQpbHfountiqyshzKG5LsChseqU+mBK8smiHhNZ3dA== X-Received: by 2002:a17:906:3783:b0:86f:e116:295 with SMTP id n3-20020a170906378300b0086fe1160295mr14836211ejc.4.1674142913163; Thu, 19 Jan 2023 07:41:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: crosa@redhat.com Subject: [PATCH 2/5] scripts/ci: support CentOS Stream 8 in build-environment.yaml Date: Thu, 19 Jan 2023 16:41:42 +0100 Message-Id: <20230119154145.471156-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com> References: <20230119154145.471156-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674146150787100003 Content-Type: text/plain; charset="utf-8" Update the CI playbook so that it is able to prepare a system with a fresh CentOS Stream 8 install, rather than just support RHEL. The ninja-build package is only available if the CentOS Powertools are enabled, which indeed is what the org.centos/stream/8 playbook is already doing. Signed-off-by: Paolo Bonzini --- scripts/ci/setup/build-environment.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index b04c2b7ceee9..ad63bbb3ccf7 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -130,6 +130,16 @@ - ansible_facts['distribution_version'] =3D=3D '20.04' - ansible_facts['architecture'] =3D=3D 'aarch64' =20 + - name: Enable PowerTools repo on CentOS 8 + ini_file: + path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo + section: powertools + option: enabled + value: "1" + when: + - ansible_facts['distribution_file_variety'] =3D=3D 'CentOS' + - ansible_facts['distribution_major_version'] =3D=3D '8' + - name: Install basic packages to build QEMU on EL8 dnf: # This list of packages start with tests/docker/dockerfiles/centos= 8.docker @@ -165,7 +175,7 @@ - zlib-devel state: present when: - - ansible_facts['distribution_file_variety'] =3D=3D 'RedHat' + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] - ansible_facts['distribution_version'] =3D=3D '8' =20 - name: Install packages only available on x86 and aarch64 @@ -175,6 +185,6 @@ - spice-server state: present when: - - ansible_facts['distribution_file_variety'] =3D=3D 'RedHat' + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] - ansible_facts['distribution_version'] =3D=3D '8' - ansible_facts['architecture'] =3D=3D 'aarch64' or ansible_facts[= 'architecture'] =3D=3D 'x86_64' --=20 2.38.1 From nobody Sat May 18 15:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674145241; cv=none; d=zohomail.com; s=zohoarc; b=b+/0nxJGRUTWJXE5uExWqBPh8fgjS+C+pFTM+oivi50D1UvOx6jmI5CyofFf6J0TXDPCzhEn/qatRt36A+XgQvOBEMkts1Y9pqV1E28NzytG/Aawd90NY361d6FiMVISGTE9B+7v1DcUgryzOWsRdLJE6f9tOUOv6UVv7QCF01c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674145241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zX8C+Y8fMCYubHJBZFajhe4JnvHkJyibl8fa75QOFD4=; b=l5z6Svjjqx1BZaRO44Vv89mHrGO71q3YB+WKaiFCWLyKbIBb34EaYQEqjyhbNMqsrYDPiW8g6FnIm46nHrHY1KDyAbh0OwAH7JSx8K56drxFZYBlURfNsbUpA68QNotfidPQMmeWSllKc/XM9uqj7+sDWZocI7EDhHbmM8YdYQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167414524154791.02723183004389; Thu, 19 Jan 2023 08:20:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIX6R-000446-59; Thu, 19 Jan 2023 10:45:23 -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 1pIX6I-00043f-7H for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:45:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIX6G-0006L5-KD for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:45:13 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-16-i3FrQM8dPO6Q3fdA5GvlKQ-1; Thu, 19 Jan 2023 10:42:24 -0500 Received: by mail-ej1-f72.google.com with SMTP id hp2-20020a1709073e0200b0084d47e3fe82so1862365ejc.8 for ; Thu, 19 Jan 2023 07:42:14 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id sa14-20020a170906edae00b008639ddec882sm10202429ejb.56.2023.01.19.07.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674143111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zX8C+Y8fMCYubHJBZFajhe4JnvHkJyibl8fa75QOFD4=; b=LoMudNjk7Jf6xoesWqjLIymyXhO3IR5dg6rW2MYFEoplanAtxEaTVwwrZl0oNz1uSY1t7T m5EgblZpePVq7cbMEEDbfonqsgaRgtucLNGDk6MTyG81VdXaGbde9okaBWvo/Ck0av9gFn Sz+eP+qy/TZaHdbugMvla7HV7sdkO1A= X-MC-Unique: i3FrQM8dPO6Q3fdA5GvlKQ-1 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=zX8C+Y8fMCYubHJBZFajhe4JnvHkJyibl8fa75QOFD4=; b=hRoyQ2rm/ciEWBOZ2ADhkMQXoZRx5nr+bOqGZdPQVEDwfK/nW83xyCjhb3XA4PcGs2 zbmNQgnh7r+ekZLK3ZvqQQHlrXpC+FunEjrfn5vmpJky3mYXA3zsgH41Q6qT1E5SW28K sQ+gvRnLJBIffbeU6pAGVnWudVwjKPrp2EExP3s6RLjaR+zAnm53iazQhkyh6Il1Qdiu 3qfbRwpjxBIwwS4A58voNVa7YgDxLFuCEx1KcaDY0o2p3wP899usC+89NK5BEa2UAIY+ mM/azaZUAgR2BNa1ibfONDtAcu/DC24BlGOPqaU6WOZtX2N32f2qX8npVL+DUDAjcuC8 OaGA== X-Gm-Message-State: AFqh2krbUGd8UVCNfb3knTyYWplNP2CT8Xj3DII/ooYpcLKfVY8kWsdx jvtVT+O3OZxRa//JQMlxYbmoiuknA7qYk/Z2YJtj5NnJp6Pz2XLDmkDYh2xKD3NodO6VVCaO3Dp EhrvaXv1/0ej1FR0AyidDBJvAlQaA7WsTQrooM3x28es36wYmLkxFOPkJLjadRvewMpk= X-Received: by 2002:a17:907:3a15:b0:819:7d8f:9684 with SMTP id fb21-20020a1709073a1500b008197d8f9684mr21400610ejc.72.1674142915958; Thu, 19 Jan 2023 07:41:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsogaggTbWOpuOxDd3opiXvatxTpJJI2tdr1ac6zL9sbJH0qd49uP2SxEYy/mUGdPYjhyvoww== X-Received: by 2002:a17:907:3a15:b0:819:7d8f:9684 with SMTP id fb21-20020a1709073a1500b008197d8f9684mr21400597ejc.72.1674142915689; Thu, 19 Jan 2023 07:41:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: crosa@redhat.com Subject: [PATCH 3/5] scripts/ci: add capstone development packages Date: Thu, 19 Jan 2023 16:41:43 +0100 Message-Id: <20230119154145.471156-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com> References: <20230119154145.471156-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674145242173100001 Content-Type: text/plain; charset="utf-8" Capstone is not provided anymore by QEMU as a submodule since commit 83602083b4ad ("capstone: Remove the capstone submodule", 2022-05-18). For the org.centos/stream/8 playbook to actually provide a usable build environment, it needs to include the capstone-devel package. Include it in the "basic" build packages as well so that the resulting QEMU has full disassembling functionality. Signed-off-by: Paolo Bonzini --- scripts/ci/org.centos/stream/8/build-environment.yml | 9 +++++++++ scripts/ci/setup/build-environment.yml | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts= /ci/org.centos/stream/8/build-environment.yml index fe8807b7b074..95474ad034dc 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -10,6 +10,14 @@ check_mode: yes register: centos_stream_8 =20 + - name: Enable EPEL repo on CentOS Stream 8 + dnf: + name: + - epel-release + state: present + when: + - centos_stream_8 + - name: Enable PowerTools repo on CentOS Stream 8 ini_file: path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo @@ -22,6 +30,7 @@ - name: Install basic packages to build QEMU on CentOS Stream 8 dnf: name: + - capstone-devel - device-mapper-multipath-devel - glusterfs-api-devel - gnutls-devel diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index ad63bbb3ccf7..2e5f3b06028a 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -46,6 +46,7 @@ - libbrlapi-dev - libbz2-dev - libcacard-dev + - libcapstone-dev - libcap-ng-dev - libcurl4-gnutls-dev - libdrm-dev @@ -130,6 +131,15 @@ - ansible_facts['distribution_version'] =3D=3D '20.04' - ansible_facts['architecture'] =3D=3D 'aarch64' =20 + - name: Enable EPEL repo on EL8 + dnf: + name: + - epel-release + state: present + when: + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] + - ansible_facts['distribution_major_version'] =3D=3D '8' + - name: Enable PowerTools repo on CentOS 8 ini_file: path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo @@ -148,6 +158,7 @@ name: - bzip2 - bzip2-devel + - capstone-devel - dbus-daemon - diffutils - gcc --=20 2.38.1 From nobody Sat May 18 15:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674146094; cv=none; d=zohomail.com; s=zohoarc; b=bRhcgBhTq2KHNhF1ZkvWg407K1bshHDxp+362i7JILyDGNhU4Koh/cp2kCcGWiv9EC5T3G8g6JliD2dkOTI9O4jQAtU7Z667YplErG6QtCONgaF3L2BLDlVLjl1pO31dkmXjeNRqhM+EpfxhO2zhNFyBan6eKjzJrPEjDJDhjcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674146094; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KWLsKl8EL36g2e2+PVv2QmUwvNRnbldG5EGD5LEWexY=; b=Kf8neDdUF6zh0bzBXUfRbhnjdmHFZRk3uvT8X8XT0+fjnxWXbVkRZt0hZ7XcKEZQ0mTfNWBKa4gSfiKorV3UUNCQFjGDFigaTgKrP/7IKk2ykz+BZxaVFhv9k7yiTeBMVDsVR6bTAjU4UkuHliDmvBucVcPVmupAPbAD/LhuOnU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674146094239374.0432024961408; Thu, 19 Jan 2023 08:34:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIX3G-00008Z-KG; Thu, 19 Jan 2023 10:42:06 -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 1pIX3F-00007t-6e for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:42:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIX3D-0005sA-JX for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:42:04 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-205-wm1mnpYIMzyymFh-jirCWQ-1; Thu, 19 Jan 2023 10:42:00 -0500 Received: by mail-ej1-f69.google.com with SMTP id qw29-20020a1709066a1d00b008725a1034caso1882021ejc.22 for ; Thu, 19 Jan 2023 07:42:00 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id f17-20020a170906495100b0086dd8f20a6asm7290227ejt.77.2023.01.19.07.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:41:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674142922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KWLsKl8EL36g2e2+PVv2QmUwvNRnbldG5EGD5LEWexY=; b=Nzb+ykJXzdVBFbflbq9PytB234IwtPjvGqs8epcGRHkaYa3sN/0DvoZq6tDqQboXS/Z/3l LEw1Bh842XNQRFWhT/dYCloJYRC7z2U+wHbzeS5WR8Ze6IoNtII4ZkwRuKI7RqChX0qStp b14PGQTlyD9g0yRi1H3K9mQJ2R76+qU= X-MC-Unique: wm1mnpYIMzyymFh-jirCWQ-1 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=KWLsKl8EL36g2e2+PVv2QmUwvNRnbldG5EGD5LEWexY=; b=555H/Fr/PmOFkxRleB1hf4jHplpENBaq0ej1jktBdF2lKLhhEDnlsM1DF5iqyTZVJJ Pt30GDJukG4m2J42NKmtu6hmFZnB40NE4aBSFdRveWF3jaMbJk0c4r67Rka34fH8VnVK CZ1C6Y+pbyb/adfIUZKPmZ2+DHT4/uvNTo2MpURaTf+4jwN3E8H+rB6GH3ozfITcb4zy c654FBKAdHoqooYReIHoUCK5pbRWUi8OGaWkGOasnhngWOCDTBf0feJeGIjJqKTyqEkx p4/do2GVSHUmp4vulWveiVc9W1w/jk+AWEyMOmCQIOg1aekOjZy8ozssOP6JzfGRBTTh K73Q== X-Gm-Message-State: AFqh2krRpjUty7OgI+OmaGiVCP0sZK2HZxPl816oW6dk63V4crBZB5YL pEJoz+eGJSaztlK34xFPc/+WHBCxWWnySFLdYD4GnNaiBXrH3kEdI+JZaP4SHk2s30P2nU1R14E 2sLQFT3XQ9T6fRvmdJmhPx77taQksPUuLehLSVORtvFhinDEFCW8iVlcZVx4et17ACHM= X-Received: by 2002:a05:6402:380b:b0:499:e665:8683 with SMTP id es11-20020a056402380b00b00499e6658683mr13319448edb.2.1674142918751; Thu, 19 Jan 2023 07:41:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXueoK1ApADNa3aSqzYwXQw3OKsLEtEclqzCHqzhsjRmW28gmGTKQJ/VUnJCuHhuOh9on8eLTw== X-Received: by 2002:a05:6402:380b:b0:499:e665:8683 with SMTP id es11-20020a056402380b00b00499e6658683mr13319421edb.2.1674142918367; Thu, 19 Jan 2023 07:41:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: crosa@redhat.com Subject: [PATCH 4/5] scripts/ci: unify package lists for CentOS in build-environment files Date: Thu, 19 Jan 2023 16:41:44 +0100 Message-Id: <20230119154145.471156-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com> References: <20230119154145.471156-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674146096298100003 Content-Type: text/plain; charset="utf-8" scripts/ci/org.centos/stream/8/build-environment.yml has a slightly differe= nt list of packages compared to scripts/ci/setup/build-environment.yaml. Make them the same for simplicity. Signed-off-by: Paolo Bonzini --- .../org.centos/stream/8/build-environment.yml | 25 +++++++++++++++++++ scripts/ci/setup/build-environment.yml | 20 ++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts= /ci/org.centos/stream/8/build-environment.yml index 95474ad034dc..b1768d18afac 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -30,13 +30,26 @@ - name: Install basic packages to build QEMU on CentOS Stream 8 dnf: name: + - bzip2 + - bzip2-devel - capstone-devel + - dbus-daemon - device-mapper-multipath-devel + - diffutils + - gcc + - gcc-c++ + - genisoimage + - gettext + - git + - glib2-devel - glusterfs-api-devel - gnutls-devel + - libaio-devel - libcap-ng-devel - libcurl-devel + - libepoxy-devel - libfdt-devel + - libgcrypt-devel - libiscsi-devel - libpmem-devel - librados-devel @@ -44,13 +57,25 @@ - libseccomp-devel - libssh-devel - libxkbcommon-devel + - lzo-devel + - make + - mesa-libEGL-devel + - nettle-devel - ninja-build + - nmap-ncat - numactl-devel + - pixman-devel + - python36 - python3-sphinx + - rdma-core-devel - redhat-rpm-config - snappy-devel + - spice-glib-devel - spice-server-devel - systemd-devel + - systemtap-sdt-devel + - tar + - zlib-devel state: present when: - centos_stream_8 diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index 2e5f3b06028a..2274f736f7de 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -160,6 +160,7 @@ - bzip2-devel - capstone-devel - dbus-daemon + - device-mapper-multipath-devel - diffutils - gcc - gcc-c++ @@ -167,20 +168,36 @@ - gettext - git - glib2-devel + - glusterfs-api-devel + - gnutls-devel - libaio-devel + - libcap-ng-devel + - libcurl-devel - libepoxy-devel + - libfdt-devel - libgcrypt-devel + - libiscsi-devel + - libpmem-devel + - librados-devel + - librbd-devel + - libseccomp-devel + - libssh-devel + - libxkbcommon-devel - lzo-devel - make - mesa-libEGL-devel - nettle-devel - ninja-build - nmap-ncat - - perl-Test-Harness + - numactl-devel - pixman-devel - python36 + - python3-sphinx - rdma-core-devel + - redhat-rpm-config + - snappy-devel - spice-glib-devel + - systemd-devel - systemtap-sdt-devel - tar - zlib-devel @@ -194,6 +211,7 @@ # Spice server not available in ppc64le name: - spice-server + - spice-server-devel state: present when: - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] --=20 2.38.1 From nobody Sat May 18 15:38:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674143702; cv=none; d=zohomail.com; s=zohoarc; b=L1IqAqkH8c1g9m9vSblkLJlt8JHm04+zWwoNktaLKglYmQbl33s7lY+xkZhi2x9/vowElXIfXi5MaSyBeWQqhqv3VCI1FbmpSSIGMFfi6VIS3KrwzuavIgkq8rpnbM71fYJ7I9GDmSYTcNmyz2iEICDEjHrmD/vXfGH1GfajCuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674143702; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OHSPbNDKKqNQj00N/SjZQnEElBysXJJyDLBL1yBpViw=; b=mw1k0naNr23kginLRWp+P72nQjq/V677b8tXMJjHnaoAgh7UqLuIf5TKEfHY6CSAmTAwdf62A3QUrYSeI1AMb8wCOgh4tV0VLPJw2X1oKPI2qyhR+1MaD+NRSzCDPSRz4wd/ZUMkyRor6SZiQuDNKU9mWvHx7mR9ZQnCY/eIlBg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674143702982598.6028054470306; Thu, 19 Jan 2023 07:55:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIX3K-0000FH-MN; Thu, 19 Jan 2023 10:42:10 -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 1pIX3H-00009z-41 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:42:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIX3F-0005sP-8s for qemu-devel@nongnu.org; Thu, 19 Jan 2023 10:42:06 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-61-yIHEiz-yNoSwnM7DgQcxrw-1; Thu, 19 Jan 2023 10:42:03 -0500 Received: by mail-ej1-f71.google.com with SMTP id xj11-20020a170906db0b00b0077b6ecb23fcso1884838ejb.5 for ; Thu, 19 Jan 2023 07:42:02 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id ec49-20020a0564020d7100b0049e249c0e56sm4953332edb.56.2023.01.19.07.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674142924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OHSPbNDKKqNQj00N/SjZQnEElBysXJJyDLBL1yBpViw=; b=XCmcV3wdAeo+lsNGW2RKP2Kpfgtm5jiQoPaVu2Dkt4hrHKtS468KjuN9y+QRSTky29ebrz /lLtwXKvjd34zdDzn5AdrFQ7dQQhQcdmR96rOvgN4L0m2w435IvivXnR9fufDcovd5dF0R /X4zQXfHXbwh8tE8q7RQr5dKJzc+J9g= X-MC-Unique: yIHEiz-yNoSwnM7DgQcxrw-1 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=OHSPbNDKKqNQj00N/SjZQnEElBysXJJyDLBL1yBpViw=; b=ELP8KRSzxoTSUltpeM9QOm1T6S/J899Hubneg5JQHYG7SATVqEap7i876rnKq6akiP 6i6bQm7ncXHM+EB1QuClKzwDqEwUT1M+/DOsyn1USmGlYtQrZofJQwZz91kUiTLd5wyg PYeThI5ezr44EnvSop/iSG5N8+xZDuD7gJ9m9GR9i1OslIWixBf9qrN9gW7yPR2UR2+T C3llNLHeiKNdElBYTp0FnSXUpiWd5tGxGV6e5lyv1cJE9nKT3iuv+Np6Z12BbzjHSxUv UUmrRSSh0Jm1Mraa8AAmLukxQ++QCtOI/Uz+x16AVXMEk0t5FYSBx0U1Rz5bcpTJrN36 BGUw== X-Gm-Message-State: AFqh2kp4JNIlxCpgETGIg2HdBGoEuvWVRyWab78oj0lyLoNBoiX1r2M9 rZtjJAd78ZDs3zs4I2vBxuK4kzOiY1ORG2WOt0jSv+v7dt91anvWiGcOFqupkAf5+COrhzPshnr jt6iOxpYXz6tVvQ9K1XoW32kjIDwL1xb6sdhMPBv7rnGb0vYiaeb7LQUA2IzCVhnepHA= X-Received: by 2002:a17:906:9506:b0:86b:1ccc:d434 with SMTP id u6-20020a170906950600b0086b1cccd434mr10982054ejx.67.1674142921426; Thu, 19 Jan 2023 07:42:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXuts8y2/XRkGyuzhkq/Ru9r8afHnGtTRHcS5yC7UcXJ5+Awcjf3/ieEsI4nqTar/p94rBnMHw== X-Received: by 2002:a17:906:9506:b0:86b:1ccc:d434 with SMTP id u6-20020a170906950600b0086b1cccd434mr10982032ejx.67.1674142921086; Thu, 19 Jan 2023 07:42:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: crosa@redhat.com Subject: [PATCH 5/5] scripts/ci: bump CentOS Python to 3.8 Date: Thu, 19 Jan 2023 16:41:45 +0100 Message-Id: <20230119154145.471156-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com> References: <20230119154145.471156-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674143703415100001 Content-Type: text/plain; charset="utf-8" In preparation for bumping the minimum requirement for the Python runtime in QEMU 8.0, use the Python 3.8 package in the CentOS Stream 8 build environments. To cover all bases, the "generic" playbook sets up alternatives so that /usr/bin/python3 points to Python 3.8, while the custom runner uses the --python option to configure. The latter is probably more suitable for the task of building an RPM file. Signed-off-by: Paolo Bonzini --- .../ci/org.centos/stream/8/build-environment.yml | 2 +- scripts/ci/org.centos/stream/8/x86_64/configure | 1 + scripts/ci/setup/build-environment.yml | 14 +++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts= /ci/org.centos/stream/8/build-environment.yml index b1768d18afac..0d094d70c3b3 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -65,7 +65,7 @@ - nmap-ncat - numactl-devel - pixman-devel - - python36 + - python38 - python3-sphinx - rdma-core-devel - redhat-rpm-config diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/o= rg.centos/stream/8/x86_64/configure index 75882faa9ca5..65eacf3c56bb 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -16,6 +16,7 @@ # that patches adding downstream specific devices are not available. # ../configure \ +--python=3D/usr/bin/python3.8 \ --prefix=3D"/usr" \ --libdir=3D"/usr/lib64" \ --datadir=3D"/usr/share" \ diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index 2274f736f7de..78b1021cd420 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -191,7 +191,7 @@ - nmap-ncat - numactl-devel - pixman-devel - - python36 + - python38 - python3-sphinx - rdma-core-devel - redhat-rpm-config @@ -217,3 +217,15 @@ - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] - ansible_facts['distribution_version'] =3D=3D '8' - ansible_facts['architecture'] =3D=3D 'aarch64' or ansible_facts[= 'architecture'] =3D=3D 'x86_64' + + - name: Check whether the Python runtime version is managed by alterna= tives + stat: + path: /etc/alternatives/python3 + register: python3 + + - name: Set default Python runtime to 3.8 on EL8 + command: alternatives --set python3 /usr/bin/python3.8 + when: + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS= '] + - ansible_facts['distribution_version'] =3D=3D '8' + - python3.stat.islnk and python3.stat.lnk_target !=3D '/usr/bin/py= thon3.8' --=20 2.38.1