All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built
Date: Tue, 23 Mar 2021 16:51:29 +0100	[thread overview]
Message-ID: <20210323155132.238193-11-f4bug@amsat.org> (raw)
In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: qemu-s390x@nongnu.org
---
 meson.build         | 2 ++
 pc-bios/meson.build | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 4b614b30ed9..fccda30ffc7 100644
--- a/meson.build
+++ b/meson.build
@@ -99,6 +99,7 @@
 install_blobs_microblaze = false
 install_blobs_ppc = false
 install_blobs_riscv = false
+install_blobs_s390x = false
 if get_option('install_blobs')
   foreach target : target_dirs
     install_edk2_blobs = install_edk2_blobs or target in edk2_targets
@@ -108,6 +109,7 @@
     install_blobs_microblaze = install_blobs_microblaze or target in ['microblaze-softmmu', 'microblazeel-softmmu']
     install_blobs_ppc = install_blobs_ppc or (target.startswith('ppc') and target.endswith('softmmu'))
     install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu']
+    install_blobs_s390x = install_blobs_s390x or target in ['s390x-softmmu']
   endforeach
 endif
 
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 504f03ec925..27c0f316dee 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -64,8 +64,6 @@
   'linuxboot_dma.bin',
   'kvmvapic.bin',
   'pvh.bin',
-  's390-ccw.img',
-  's390-netboot.img',
 ))
 
 if host_machine.system() == 'windows'
@@ -121,6 +119,13 @@
   ))
 endif
 
+if install_blobs_s390x
+  blobs_ss.add(files(
+    's390-ccw.img',
+    's390-netboot.img',
+  ))
+endif
+
 blobs_ss = blobs_ss.apply(config_host, strict: false)
 
 if get_option('install_blobs')
-- 
2.26.2



  parent reply	other threads:[~2021-03-23 16:51 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-23 15:51 [RFC PATCH 00/13] blobs: Only install required (system emulation) files Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 01/13] blobs: Use Meson source_set to store blob files Philippe Mathieu-Daudé
2021-03-23 16:22   ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 02/13] blobs: Only install EDK2 license file if EDK2 blobs are installed Philippe Mathieu-Daudé
2021-03-23 16:15   ` Laszlo Ersek
2021-03-23 15:51 ` [RFC PATCH 03/13] blobs: Only install qemu-nsis.bmp on Windows host Philippe Mathieu-Daudé
2021-03-23 15:57   ` Stefan Weil
2021-03-23 15:51 ` [RFC PATCH 04/13] blobs: Only install PALcode blob if alpha system target is built Philippe Mathieu-Daudé
2021-03-23 16:29   ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targets are built Philippe Mathieu-Daudé
2021-03-23 16:29   ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built Philippe Mathieu-Daudé
2021-03-23 23:09   ` Helge Deller
2021-03-23 15:51 ` [RFC PATCH 07/13] blobs: Only install DT blobs if microblaze system targets are built Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 08/13] blobs: Only install blobs if powerpc " Philippe Mathieu-Daudé
2021-03-23 23:09   ` David Gibson
2021-03-23 15:51 ` [RFC PATCH 09/13] blobs: Only install firmware blobs if riscv " Philippe Mathieu-Daudé
2021-03-23 15:51   ` Philippe Mathieu-Daudé
2021-03-23 21:28   ` Alistair Francis
2021-03-23 21:28     ` Alistair Francis
2021-03-23 15:51 ` Philippe Mathieu-Daudé [this message]
2021-03-24  5:52   ` [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built Thomas Huth
2021-03-30 16:47   ` Cornelia Huck
2021-03-23 15:51 ` [RFC PATCH 11/13] blobs: Only install SPARC firmwares if sparc system targets are built Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 12/13] blobs: Only install x86 blobs if x86 " Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 13/13] meson: Only build ROM/BIOS when system emulation is built Philippe Mathieu-Daudé
2021-03-23 16:15   ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210323155132.238193-11-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=cohuck@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.