From nobody Tue Feb 10 20:47:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514743; cv=none; d=zohomail.com; s=zohoarc; b=FQ0gdfglJVllhGUj8tarDNy1Xql73N36/r62ATnWwyPxILKw1zF3qS9VSLZTGfwnuWeck9S7fggKDYGndc6lO+Yq6yVfp9trQchmJuU4anG6lVwEDJsnqAqh2teEtiNQ8g6koaB4MHz38ZpH1LpgnmGiwog3NAO/WQ6VnMdlFcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514743; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=e4KmmDhaZr03CiGut6rrH2ZGN1Nc0SohWOXV5AA87G5lG2X3ldIKjhAEUocXYbTGTcJ2rhzowR+9ytYHWSA4DI378PHg28ZuFiKlxJxoQk9z8RbhW1RfftkH9u3c1MgnkBi5klFx7Afa3hHvyKPuJMSFYdjBy8XA/hpcYKjDT50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1616514743723426.1720541592699; Tue, 23 Mar 2021 08:52:23 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so11122396wmi.3 for ; Tue, 23 Mar 2021 08:52:23 -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 c131sm3108481wma.37.2021.03.23.08.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:21 -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=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=GJSEbMUHcK7MG1bOkO17yk6KMdusvFzkeFNWiEp6u+TCKUQoQrhc9vdCdLw6TJcKZu sqSHy76uPlx6PCStqBAPlfv+yay+T8WSseU/POu6j3/yi83CJpPyyBd5P6rSD5zPPE6x Izrv/0cJpGVP71l8hsVFA/o9KTSMeAbQqMu5/5vf8mzB8NO3sBwafzXk/72jqFpbll6T Y1KZ/pSYWcoZqM/sLnhxf+8PYVGA8XxV4h1wvJC+WQcwC2XOSQn77YsomE73V7BWUDiV /Cf9l9D4if/Tb6+qHJKWH8hEAUuWHqptn8lcnV8ZCzYL4eV4PNuK1VINYg4Cx+YgeX0Z H6ag== 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=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=rmd7U1N9X9DisxuVzPOhTpxBsUzCpSsOcBAScJCk/dd7WokLpZJ7cKsnMdQt8rYX4P bYi1x+DVaTvPR775FwNaafbNKHW8ebuGDZ+YHNvRr66wCAoJssALEA1rXhMKzTNSyu65 GKO19XFfGIaIC26BVuv52utaeQBWuwKNOtDrPzSHwep/XTAeDKOgVOtLkmJi4s0Tj+Mj 6MAXP6lJrWX4H/K+uXOZscIpu4E8T7Wb4CzgkEmVM8df6BzQ3PLBbeiiNUtGcntZC9SS Y294fs42n+aVBQL5vsLrX+z6V/idZV+hSNtbTbRbnxvvkZlx1RGyszTvR9cZeUYiNbql dbKw== X-Gm-Message-State: AOAM530S3QWKe8Evq7hqvITO/vgh8moGEl4VP5ZLNrhKi8Z/xYYzZw71 bjSDTxY/BC4QW9OZ2W+jBDQ= X-Google-Smtp-Source: ABdhPJxQV4LtGiyYIBigA5Cb8mTzHIyoyQnjdxfUMhiJPQLhBx2aMWa4nwF3yrCztkKPhc/cJ7AEuw== X-Received: by 2002:a1c:bb0b:: with SMTP id l11mr4126287wmf.150.1616514742008; Tue, 23 Mar 2021 08:52:22 -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?= , Cornelia Huck , qemu-s390x@nongnu.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 Message-Id: <20210323155132.238193-11-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 Acked-by: Cornelia Huck Reviewed-by: Thomas Huth --- Cc: Cornelia Huck Cc: Thomas Huth 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 =3D false install_blobs_ppc =3D false install_blobs_riscv =3D false +install_blobs_s390x =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -108,6 +109,7 @@ install_blobs_microblaze =3D install_blobs_microblaze or target in ['m= icroblaze-softmmu', 'microblazeel-softmmu'] install_blobs_ppc =3D install_blobs_ppc or (target.startswith('ppc') a= nd target.endswith('softmmu')) 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'] endforeach endif =20 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', )) =20 if host_machine.system() =3D=3D 'windows' @@ -121,6 +119,13 @@ )) endif =20 +if install_blobs_s390x + blobs_ss.add(files( + 's390-ccw.img', + 's390-netboot.img', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2