From patchwork Thu Dec 19 12:23:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11303495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64EB6139A for ; Thu, 19 Dec 2019 12:53:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B51320716 for ; Thu, 19 Dec 2019 12:53:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B8zFn6/M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B51320716 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvIb-0004Sr-TH for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Dec 2019 07:53:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurw-0000Ui-RM for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurv-0002PG-HT for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50286 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurv-0002N6-B0 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758325; 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=Chk0PAaaVjz9FRUSm1XE8XtXZ4zZv3MPs/UVF4gbsq4=; b=B8zFn6/MnUaxY1AK0jqtLE/b1FzTVD0gk//GbMW4z9o8UvC1WmClm9Hu6vJWRR4M/cSa2i 6AWzCLDr1zhbOyRQz4sBXL/Kq1mI3+ywFk4rO1wxkAGa20bSYgl8P37elITSBFbIIaN9u9 m2TDPMw7/MrN8qOR1dOmFbiQLo3o224= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-3Qn_yAI8NuKjc-wEKQrVBg-1; Thu, 19 Dec 2019 07:25:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BCD8800D48 for ; Thu, 19 Dec 2019 12:25:19 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E84660C18; Thu, 19 Dec 2019 12:25:18 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 121/132] meson: install edk2 Date: Thu, 19 Dec 2019 13:23:41 +0100 Message-Id: <1576758232-12439-30-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 3Qn_yAI8NuKjc-wEKQrVBg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- Makefile | 7 ------- pc-bios/meson.build | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d64e481..e961286 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,6 @@ generated-files-y = config-host.h generated-files-y += .git-submodule-status -edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; @@ -267,7 +266,6 @@ endif ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 install: all install-datadir install-localstatedir \ - $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(vhost-user-json-y),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/" @@ -280,11 +278,6 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifdef INSTALL_BLOBS - set -e; for x in $(edk2-decompressed); do \ - $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)"; \ - done -endif ifneq ($(DESCS),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 5524b95..18201b0 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -11,11 +11,15 @@ fds = [ 'edk2-x86_64-secure-code.fd', ] -foreach f : fds +install_blobs = 'INSTALL_BLOBS' in config_host + +foreach f: fds custom_target(f, output: f, input: '@0@.bz2'.format(f), capture: true, build_by_default: true, - command: [ bzip2, '-dc', '@INPUT0@' ]) + command: [ bzip2, '-dc', '@INPUT0@' ], + install: install_blobs, + install_dir: config_host['qemu_datadir']) endforeach