From nobody Tue Nov 18 15:24:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610649157; cv=none; d=zohomail.com; s=zohoarc; b=N17tz3BWl5A73Im3vCo82Io6UkFH6YHP4sXTgyIfO18nOXu0CO8qUiV9TnSelxN7/Rm2WUVtJbPqZMSR9YD20PkU9YBZLuddBa6sF3bfAy4gxlOhlFhWSU6GmJiAocF6A4LwaIVNjBQa5lM45yuDxd4enHQktALyYym0ey1GqcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610649157; 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=waRpQeMmI+OyRXJ1iEv747KR9KPmFDzQu/Etfs943VI=; b=Xeh0A/YYxpmBqKeZoZsi6w0kCOsqNYxuJVleIugLH0otbhLhCpSaxK5V5HXi/SVKuzYM/wLDgzWOhbS2VO+E0Jg4OqaXkWz8Xgw47tDUQzeU8k2E3numOp01j7sbJh13XdjWm//68KU/RZOHXCj8EvBhgMcZPTk3hD9i2R1m0eo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610649157665172.48018726030102; Thu, 14 Jan 2021 10:32:37 -0800 (PST) Received: from localhost ([::1]:51866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l07QC-0002Ed-Hb for importer@patchew.org; Thu, 14 Jan 2021 13:32:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l06gk-0000a5-1k for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:45:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l06gW-0005pr-G3 for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:45:31 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-6yUwEM3mPc-PPS0cTiY13w-1; Thu, 14 Jan 2021 12:45:18 -0500 Received: by mail-wm1-f71.google.com with SMTP id r1so2148777wmn.8 for ; Thu, 14 Jan 2021 09:45:18 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id x17sm11131704wro.40.2021.01.14.09.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 09:45:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610646320; 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=waRpQeMmI+OyRXJ1iEv747KR9KPmFDzQu/Etfs943VI=; b=b3bQvicDKj4gpcO7cwgnuyxixcFeKDmY/nbDNhJoiAOermTqgfoZ+5ADh52WHbfHQWMhNP FBVeRm/hqO2TTyamSM+kPYicbzCRa+Cul7iVcDmG+UZ5JGdHdti9EFxcRspRUshGimlC3h RCmlBKNFFjMmdVoN0P65+ObFmjIRNXs= X-MC-Unique: 6yUwEM3mPc-PPS0cTiY13w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=waRpQeMmI+OyRXJ1iEv747KR9KPmFDzQu/Etfs943VI=; b=NRYFQSaeRkRupX0vMvntljR+TUndEQa6wU7VOpDfV3VAzdanYCve47z4BKSk6HlIva vJvC0w85BbTI6HNp2wbySExkILBohudIDIfM0wc3sXwtM581wOjfd8utozellLK7GGEh p7ZaVflAyO/a7Ok5zq6GqqZUYQ1F5lyOzFDYgIY7Q2f0q0j5IBxs8IQkjHMXLDI17dim W9MR9EVpziWwjo9bSv1KWo8aL04XKeQn+8BKyR0HpuVbbOoyLjRzbKTU5j/Qh+jYcJnv 0DJPIFdoyvjTkfPVnm1JfZcuVdy63eCybL+u00pkZUTUXEJy8QGY2HO3tPsR+89C/nBR HyMw== X-Gm-Message-State: AOAM532GsD6LwX8Bz99fQ1Gw6U5Q6mNI9gbiFL+5j3dTBR0AqQND1NJy Wxl0vKMjM130j5zUP2vXsPKuO90hzJ42lynTxXGYiMwIYGWBMIT/72knDidpn6mpKsA2o3ineAL 6td5fTfgrvNki3ULa7X3rtv31yl3JdiFIoX9bQYDs8qJbq4r+I0sByo9v967lOz4y X-Received: by 2002:a5d:6983:: with SMTP id g3mr9147158wru.168.1610646316814; Thu, 14 Jan 2021 09:45:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRnlQSfYOEUr02LzYwEDlhTEnKxJrlGz/s32OGaWbZIqknNxDOsSQI53u7zRxH0bMPnunNog== X-Received: by 2002:a5d:6983:: with SMTP id g3mr9147138wru.168.1610646316625; Thu, 14 Jan 2021 09:45:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] meson.build: Declare global edk2_targets / install_edk2_blobs variables Date: Thu, 14 Jan 2021 18:45:08 +0100 Message-Id: <20210114174509.2944817-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210114174509.2944817-1-philmd@redhat.com> References: <20210114174509.2944817-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Globally declare in the main meson.build: - the list of EDK2 targets, - whether the EDK2 blobs have to be installed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laszlo Ersek --- Patch trivial to review using 'git-diff --ignore-all-space' --- meson.build | 8 ++++++++ pc-bios/descriptors/meson.build | 30 ++++++++++++++++-------------- pc-bios/meson.build | 5 +---- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build index 3d889857a09..ecc45d04d6a 100644 --- a/meson.build +++ b/meson.build @@ -88,6 +88,14 @@ } endif =20 +edk2_targets =3D [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_= 64-softmmu' ] +install_edk2_blobs =3D false +if get_option('install_blobs') + foreach target : target_dirs + install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets + endforeach +endif + ################## # Compiler flags # ################## diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 7040834573d..ac6ec66b007 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -1,14 +1,16 @@ -foreach f: [ - '50-edk2-i386-secure.json', - '50-edk2-x86_64-secure.json', - '60-edk2-aarch64.json', - '60-edk2-arm.json', - '60-edk2-i386.json', - '60-edk2-x86_64.json' -] - configure_file(input: files(f), - output: f, - configuration: {'DATADIR': qemu_datadir}, - install: get_option('install_blobs'), - install_dir: qemu_datadir / 'firmware') -endforeach +if install_edk2_blobs + foreach f: [ + '50-edk2-i386-secure.json', + '50-edk2-x86_64-secure.json', + '60-edk2-aarch64.json', + '60-edk2-arm.json', + '60-edk2-i386.json', + '60-edk2-x86_64.json' + ] + configure_file(input: files(f), + output: f, + configuration: {'DATADIR': qemu_datadir}, + install: get_option('install_blobs'), + install_dir: qemu_datadir / 'firmware') + endforeach +endif diff --git a/pc-bios/meson.build b/pc-bios/meson.build index fab323af84e..6a341b6cea0 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,7 +1,4 @@ -if 'arm-softmmu' in target_dirs or \ - 'aarch64-softmmu' in target_dirs or \ - 'i386-softmmu' in target_dirs or \ - 'x86_64-softmmu' in target_dirs +if install_edk2_blobs bzip2 =3D find_program('bzip2', required: true) fds =3D [ 'edk2-aarch64-code.fd', --=20 2.26.2 From nobody Tue Nov 18 15:24:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610646948; cv=none; d=zohomail.com; s=zohoarc; b=n7YfcLLo+ggq2dd11WlB22M/4SbwWdLaifX8MTstHj0St0o2K7fihvosyD15NkSKrAbGiaPIy8vdzk+FUSN8q4VqvTWvQEKpcXwyycoogNHA3rqaRnApdUn4CCCP9Rm32XGvX9gfRZ+39xUM26lDvQxhm+N6lhtALoMn38NkYVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610646948; 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=zyxTfxS9N7W6odCb26oUbs8f91QaNWio8M561x7sKdA=; b=dGnQPUAXGzkuLx99vqUx8ClaqCDcmQFY5gxoGCP7mDDChjn23+cSfBGmmPZqtBwnWmcDEWyzR2LlmypTzaZLOu7pHnMxvs2icho2KSJWImHJibfghWFiKfSM8ywmdgiv/kswcuBRpiRc5apyD6VVAhYR7BU0CrZeOlTkPaTEaAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610646948640300.1347029113899; Thu, 14 Jan 2021 09:55:48 -0800 (PST) Received: from localhost ([::1]:33086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l06qY-0007qj-H2 for importer@patchew.org; Thu, 14 Jan 2021 12:55:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l06gk-0000a4-1x for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:45:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l06gX-0005si-DZ for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:45:35 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-vxR8l_W-M2aQ8aHdydxzYA-1; Thu, 14 Jan 2021 12:45:23 -0500 Received: by mail-wm1-f70.google.com with SMTP id c2so2649763wme.0 for ; Thu, 14 Jan 2021 09:45:22 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id n16sm10977801wrj.26.2021.01.14.09.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 09:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610646324; 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=zyxTfxS9N7W6odCb26oUbs8f91QaNWio8M561x7sKdA=; b=TM1bCc4hMMDLvH8Sx/gYz4E+91UZr9EnnGttFshmy4qkbC/sfX7yMgRbxQZccBjop2w/l8 GrUoUJiMSu4uP4b//rwmoBGckPgXiReQUedz7kzdHeNXLdVkVJvMvmvL7kyp/p0GOPkMH/ J9ZyRMRF2eEyTZlfcgX3ujRQIeT+l8Q= X-MC-Unique: vxR8l_W-M2aQ8aHdydxzYA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zyxTfxS9N7W6odCb26oUbs8f91QaNWio8M561x7sKdA=; b=XchKXXd01pWiobUPPjuPRJ7ECXnnGV6vbDR7+JvUbINokYGcx2g9C7mqfR5m0HXRYF gaSbRld0aSe7ld3BGKRoHK0kj78x3pyK+GJqrpH7+7yslXN37SxLtpQP6g0M2D/DXyma N5099JK6zm7TOSvas5uJRHX8bMGh5bPq/dq15e2pnv+SKvyNmTpmDAv2/Ju8g/ScGqQ0 5aQywPYgacYOqCrvAeVqVgxRNgxMBgypODHSNgkczsAgrZrcOcRcP7vmJdKFmH+0WhVg kJr2PjZzVljxYe9zTshaY4Yi3DNBXgIsQgTywdKlv7kNaQJCXSC6FkSUOIoCHAgZJ/16 +o6w== X-Gm-Message-State: AOAM531rsSZf4jToNxFhI60I6u1TsjgihsZpGX+5dYa4ES+P+rYwi84S LN0ZktlR5oLYRUkOjB0CaXAjePobo587RYnUeS39d/DxQn/pmRjZLIYEMjuhI0SDshHZSqq0yi1 dAtzuoKcANYW1LV34J9RHJtNBiyuXmwEs/xjVR70u5+/BLzt67xtrwSJFdnoILlLQ X-Received: by 2002:a1c:6a0e:: with SMTP id f14mr4885704wmc.102.1610646321556; Thu, 14 Jan 2021 09:45:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJw81gZdm4n8jfvM8Ypum7rCFamepv7jm3uU9kDsWVYM9kOoUcmAaZCzrc62+TcdR4GHK9na8g== X-Received: by 2002:a1c:6a0e:: with SMTP id f14mr4885686wmc.102.1610646321380; Thu, 14 Jan 2021 09:45:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] meson.build: Detect bzip2 program Date: Thu, 14 Jan 2021 18:45:09 +0100 Message-Id: <20210114174509.2944817-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210114174509.2944817-1-philmd@redhat.com> References: <20210114174509.2944817-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The --enable-bzip2/--disable-bzip2 configure arguments are somehow misleading, they check for the bzip2 library, not the bzip2 program. We need the bzip2 program to install the EDK2 firmware blobs (see commit 623ef637a2e "configure: Check bzip2 is available"). Check if the bzip2 program in the global meson.build to avoid the configuration to succeed, but a later when trying to install the firmware blobs: ../pc-bios/meson.build:5:2: ERROR: Program 'bzip2' not found Reported-by: John Snow Suggested-by: Paolo Bonzini Fixes: c8d5450bba3 ("configure: move install_blobs from configure to meson") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laszlo Ersek --- meson.build | 2 ++ pc-bios/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ecc45d04d6a..954152c90fe 100644 --- a/meson.build +++ b/meson.build @@ -96,6 +96,8 @@ endforeach endif =20 +bzip2 =3D find_program('bzip2', required: install_edk2_blobs) + ################## # Compiler flags # ################## diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 6a341b6cea0..af95c5d1f1d 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,5 +1,4 @@ if install_edk2_blobs - bzip2 =3D find_program('bzip2', required: true) fds =3D [ 'edk2-aarch64-code.fd', 'edk2-arm-code.fd', --=20 2.26.2