Re: [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built

2021-03-30 Thread Cornelia Huck 
On Tue, 23 Mar 2021 16:51:29 +0100
Philippe Mathieu-Daudé  wrote:

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

Acked-by: Cornelia Huck

Re: [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built

2021-03-23 Thread Thomas Huth 

On 23/03/2021 16.51, Philippe Mathieu-Daudé wrote:

Signed-off-by: Philippe Mathieu-Daudé 
---
Cc: Cornelia Huck 
Cc: Thomas Huth 
Cc: qemu-s3...@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')




Reviewed-by: Thomas Huth

[RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built

2021-03-23 Thread Philippe Mathieu-Daudé 
Signed-off-by: Philippe Mathieu-Daudé 
---
Cc: Cornelia Huck 
Cc: Thomas Huth 
Cc: qemu-s3...@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