From nobody Wed Feb 11 05:51:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514753; cv=none; d=zohomail.com; s=zohoarc; b=QJk1oaqA0eSCvgbFFxeViUQ9Q1Z0sSII9absOg23QEdGkf95tdcmob+FAhITHXByXxcKzyuLRtfJgmol9peZagXb4tGrsdcploEZBTPhilFFvtp1PUnmA++3ViTu9baBLr0Bwtj3OpY7OfZMmhUEskFYCIeV4zpehzNy2ldbI/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=PbsOhb1yjHlZmEssRBVATDp3BolGxeFoeb/wgVbRdL+OYGQpLn20OAwdyCpABiBoCQyRZqlEhx8fDvaX/P+9dL4qMEPiOo7DoV+2Iv4P0YbozGHDC5NxbfF+ydnL3JOoc7/OaukcG2wAXY1nbBUrqYm89bw1fpmksU9gIXu1RWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 16165147532120.08384278702442316; Tue, 23 Mar 2021 08:52:33 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id j7so21306020wrd.1 for ; Tue, 23 Mar 2021 08:52:32 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id q15sm23900591wrr.58.2021.03.23.08.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=rhUUrbPH+U/TaeN9ncE8F+Gr8h0PPiDq4DiVNUz+MlAzrZn+cu4DB2DnLFlHi99Rev lKcyAxC49uifFWt9YglgBLqEZ7kELScYDCrubIcPCfvl2TbrS4GA3zWSqcMIe8059Iuc I5zYKNkiEpHBXkEo5EFOCyOr/k3xRXFQMZlontVMzKKChLIn//BHvGZeecYEDu74QYRs W2KpblOBoaMQqQrqhE8VUHvsmIgT7O+R573SNCw53EGyWeW598tYGbXBPAtsaKNjCGoN 9zyk7kCe63TgQr89PqS+xcXcq1mH87htrB9Rn5Eu7Jdb3txPwrx5thTrKAlLLi4knG/u oocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=aGotYCMSuhhe6pcLogoVCbgwM0Ls9Pn/+kU2FsCZoz9aYunBqVsynzMyVwg8jgMxDs czfrnBRJq3fN0nYTfhPfg4q1bABrL6MqDdyuRP7hRUuJCL3KzcO0NOst9Xowik4Qxf1I C8uXI4/ZbNczFsbvAC6WMJ0b//MCrkYvd89asAJ8bmsFvjVMTPvxPEGSpm0JL4qg8ERX FdqoDlO8pz9xeoyo8VOosKWBMdjbnBjAWrTOz63zwRjMrD0QS5yGBFU9OzLqBS9xUPoC 4iAatFSqVWseeuhGIFW+wPAzJ98LKLjBY5KdyI+GZ9eJl115lzUgl+zmtd1oLL2r3Ht9 3P0w== X-Gm-Message-State: AOAM533TqQS3iICg/MiPtVevdEQby6x8ukpt2K4Jpd4mue8vAKXo4tw4 Gka+1yDqkIt4yH5hr57jo9z/QcKZTblQ2Q== X-Google-Smtp-Source: ABdhPJwo7VdX41AiAnvdLmOfh2xss/4KkF2bIxKuGgYqwZqwAHX+1HxxwSiq4hWu+86jtw6Cye1Aiw== X-Received: by 2002:a5d:42cb:: with SMTP id t11mr4640676wrr.280.1616514751554; Tue, 23 Mar 2021 08:52:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S . Tsirkin" , Marcel Apfelbaum Subject: [RFC PATCH 12/13] blobs: Only install x86 blobs if x86 system targets are built Date: Tue, 23 Mar 2021 16:51:31 +0100 Message-Id: <20210323155132.238193-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Paolo Bonzini Cc: Eduardo Habkost Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum --- meson.build | 2 ++ pc-bios/meson.build | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index addea8c39d7..e484670c5b7 100644 --- a/meson.build +++ b/meson.build @@ -101,6 +101,7 @@ install_blobs_riscv =3D false install_blobs_s390x =3D false install_blobs_sparc =3D false +install_blobs_x86 =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -112,6 +113,7 @@ install_blobs_riscv =3D install_blobs_riscv or target in ['riscv32-sof= tmmu', 'riscv64-softmmu'] install_blobs_s390x =3D install_blobs_s390x or target in ['s390x-softm= mu'] install_blobs_sparc =3D install_blobs_sparc or target in ['sparc-softm= mu', 'sparc64-softmmu'] + install_blobs_x86 =3D install_blobs_x86 or target in ['i386-softmmu', = 'x86_64-softmmu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 89efe4359e4..d21187545cf 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -27,10 +27,6 @@ endif =20 blobs_ss.add(files( - 'bios.bin', - 'bios-256k.bin', - 'bios-microvm.bin', - 'qboot.rom', 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', @@ -57,11 +53,6 @@ 'efi-virtio.rom', 'efi-e1000e.rom', 'efi-vmxnet3.rom', - 'multiboot.bin', - 'linuxboot.bin', - 'linuxboot_dma.bin', - 'kvmvapic.bin', - 'pvh.bin', )) =20 if host_machine.system() =3D=3D 'windows' @@ -131,6 +122,20 @@ )) endif =20 +if install_blobs_x86 + blobs_ss.add(files( + 'bios.bin', + 'bios-256k.bin', + 'bios-microvm.bin', + 'qboot.rom', + 'multiboot.bin', + 'linuxboot.bin', + 'linuxboot_dma.bin', + 'kvmvapic.bin', + 'pvh.bin', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2