From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DA45C2D0C2 for ; Fri, 3 Jan 2020 10:53:54 +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 5F83A206DB for ; Fri, 3 Jan 2020 10:53:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cd1uQRxs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F83A206DB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inKaX-0004Ko-AL for qemu-devel@archiver.kernel.org; Fri, 03 Jan 2020 05:53:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59426) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inKZR-0003Cx-KZ for qemu-devel@nongnu.org; Fri, 03 Jan 2020 05:52:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inKZQ-0000M9-Ed for qemu-devel@nongnu.org; Fri, 03 Jan 2020 05:52:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28346 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 1inKZQ-0000JZ-6j for qemu-devel@nongnu.org; Fri, 03 Jan 2020 05:52:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578048763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZoKi7+ihZvabnm+t1Qjf0ZUzTqIe4l+F6787xqEo+qc=; b=cd1uQRxsDXV8XFDPVNXDhqjE+vZD9L3bEJtN91L1UW0vaF98rKavtwvbZ+SKfJ/P8NgkvK 0gDENJ4Db37e1lRTaHWm1WaJDidE/4hrmTBIrGdUycx3zi6TlfB633nH6ahOx95UzIALQp BXL+TwFe7Np11jJBFHTWZBnNoZkLwwc= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-aC610yG2Pw2E_TkJPs1wNw-1; Fri, 03 Jan 2020 05:52:42 -0500 Received: by mail-wm1-f71.google.com with SMTP id w205so1296760wmb.5 for ; Fri, 03 Jan 2020 02:52:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9G4xGLPOBob5Ek2BT14z+eUm6G4iTMVpnCOv+ru8N3A=; b=kYWKhg5Tno6l36Bq6XvA9GkUZgZNAjGbKffBVCKyTSsS8hN9RGMSruIIvVWZgeyAfm ENP06Gj+7qnlO1IiX9nc+UAU41RpLu09UMwTB63DupcLQDHK3j+NgGR4xfkHRUlU2EC7 IIYXtp1eVFldnRVzB+nS33WKd51WcSEFTqlfvBujLxRIUlDaXFOjGO9HBZqMB+bjUdsB +t8d8ywNfl5/4UqModW7NHomfg1tS/7bj5dYzWvqDemAA6r5dNLVgNGoB4f9urmV+kdl HcSDurei5ZcBkRIFViOdkR38FSxGqr7wBZBwJqOyWFiJFiL8y9yd/LOhsBASjSOFkl8M PNIg== X-Gm-Message-State: APjAAAX/+iMbjN7yYE/sVuWn8hR3OAYohBA9GQazmH52OvAn5s3juqVr TwTFMrCbhIlxIxPN4maoWhlN2dFBfbLbPmqMXf+BM+2J1Sgvw1rw67ocl3LfAMMPR11jTyWhAVG Yneubw2Fwk14hI1s= X-Received: by 2002:adf:e6cb:: with SMTP id y11mr89539923wrm.345.1578048761114; Fri, 03 Jan 2020 02:52:41 -0800 (PST) X-Google-Smtp-Source: APXvYqx9XkNu9jDIKqrZrxGnU4C0pBiXFg2Lvc6fJOrQnUtUlrnez9OX3iabZ2wgjtciIRE8PbVmJA== X-Received: by 2002:adf:e6cb:: with SMTP id y11mr89539914wrm.345.1578048760977; Fri, 03 Jan 2020 02:52:40 -0800 (PST) Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id g21sm64352222wrb.48.2020.01.03.02.52.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Jan 2020 02:52:40 -0800 (PST) Subject: Re: [PATCH 032/132] meson: uncompress edk2 bios To: Paolo Bonzini , qemu-devel@nongnu.org References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> <1576155176-2464-33-git-send-email-pbonzini@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <3301602d-5543-a03f-ec5a-d49782d5296b@redhat.com> Date: Fri, 3 Jan 2020 11:52:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <1576155176-2464-33-git-send-email-pbonzini@redhat.com> Content-Language: en-US X-MC-Unique: aC610yG2Pw2E_TkJPs1wNw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/12/19 1:51 PM, Paolo Bonzini wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > Signed-off-by: Paolo Bonzini > --- > Makefile | 4 ---- > meson.build | 2 ++ > pc-bios/meson.build | 21 +++++++++++++++++++++ > 3 files changed, 23 insertions(+), 4 deletions(-) > create mode 100644 pc-bios/meson.build >=20 > diff --git a/Makefile b/Makefile > index 0a6615c..b880265 100644 > --- a/Makefile > +++ b/Makefile > @@ -103,9 +103,6 @@ generated-files-y +=3D module_block.h > generated-files-y +=3D .git-submodule-status > =20 > edk2-decompressed =3D $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) > -pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2 > -=09$(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<) > - > # Don't try to regenerate Makefile or configure > # We don't generate any of them > Makefile: ; > @@ -226,7 +223,6 @@ $(SOFTMMU_ALL_RULES): $(chardev-obj-y) > $(SOFTMMU_ALL_RULES): $(crypto-obj-y) > $(SOFTMMU_ALL_RULES): $(io-obj-y) > $(SOFTMMU_ALL_RULES): config-all-devices.mak > -$(SOFTMMU_ALL_RULES): $(edk2-decompressed) > =20 > .PHONY: $(TARGET_DIRS_RULES) > # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that > diff --git a/meson.build b/meson.build > index de5a26e..00c0767 100644 > --- a/meson.build > +++ b/meson.build > @@ -312,3 +312,5 @@ if have_tools > subdir('contrib/ivshmem-server') > endif > endif > + > +subdir('pc-bios') > diff --git a/pc-bios/meson.build b/pc-bios/meson.build > new file mode 100644 > index 0000000..5524b95 > --- /dev/null > +++ b/pc-bios/meson.build > @@ -0,0 +1,21 @@ > +bzip2 =3D find_program('bzip2') > + > +fds =3D [ > + 'edk2-aarch64-code.fd', > + 'edk2-arm-code.fd', > + 'edk2-arm-vars.fd', > + 'edk2-i386-code.fd', > + 'edk2-i386-secure-code.fd', > + 'edk2-i386-vars.fd', > + 'edk2-x86_64-code.fd', > + 'edk2-x86_64-secure-code.fd', > +] > + > +foreach f : fds Can strip space between f/column. Reviewed-by: Philippe Mathieu-Daud=C3=A9 > + custom_target(f, > + output: f, > + input: '@0@.bz2'.format(f), > + capture: true, > + build_by_default: true, > + command: [ bzip2, '-dc', '@INPUT0@' ]) > +endforeach >=20