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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 3EEF8C433DB for ; Thu, 14 Jan 2021 19:56:59 +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 B11FA221E9 for ; Thu, 14 Jan 2021 19:56:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B11FA221E9 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]:35274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l08jp-00038N-Sd for qemu-devel@archiver.kernel.org; Thu, 14 Jan 2021 14:56:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l08dM-0004Ol-MB for qemu-devel@nongnu.org; Thu, 14 Jan 2021 14:50:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l08dL-0003Nn-1R for qemu-devel@nongnu.org; Thu, 14 Jan 2021 14:50:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610653814; 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=Li1+q5sjzmShAje2A6MvVDmZOi9DnCPXF9UXiMHto1s=; b=cYiV6bubZg+t8Qv4bKRPAlKv1YQJTGJHbgd94IL0HntIGxodkT5tza9tqV3WSNsGERbuzi s1ohsGLOBzQ0aX74584TL3p+o5v2NtAfhjGzsPlZHF6DD5QSGOC72+KdZEO37k6z3UaxM+ tUMN1utT0uthK5Qm69uZL3RbemV35rg= 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-338-Z2f4hWE6OgqQW3w6oaF4iQ-1; Thu, 14 Jan 2021 14:50:12 -0500 X-MC-Unique: Z2f4hWE6OgqQW3w6oaF4iQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD141801FCC for ; Thu, 14 Jan 2021 19:50:11 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-194.ams2.redhat.com [10.36.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBDFA12D7E; Thu, 14 Jan 2021 19:50:10 +0000 (UTC) Subject: Re: [PATCH 2/2] meson.build: Detect bzip2 program To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20210114174509.2944817-1-philmd@redhat.com> <20210114174509.2944817-3-philmd@redhat.com> From: Laszlo Ersek Message-ID: <4372ebb1-3f86-a8e5-e140-13cb37f72e40@redhat.com> Date: Thu, 14 Jan 2021 20:50:09 +0100 MIME-Version: 1.0 In-Reply-To: <20210114174509.2944817-3-philmd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=lersek@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 01/14/21 18:45, Philippe Mathieu-Daudé wrote: > The --enable-bzip2/--disable-bzip2 configure arguments are > somehow misleading, they check for the bzip2 library, not > the bzip2 program. > > We need the bzip2 program to install the EDK2 firmware blobs > (see commit 623ef637a2e "configure: Check bzip2 is available"). > > Check if the bzip2 program in the global meson.build to avoid > the configuration to succeed, but a later when trying to install > the firmware blobs: > > ../pc-bios/meson.build:5:2: ERROR: Program 'bzip2' not found > > Reported-by: John Snow > Suggested-by: Paolo Bonzini > Fixes: c8d5450bba3 ("configure: move install_blobs from configure to meson") > Signed-off-by: Philippe Mathieu-Daudé > Signed-off-by: Philippe Mathieu-Daudé > --- > meson.build | 2 ++ > pc-bios/meson.build | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index ecc45d04d6a..954152c90fe 100644 > --- a/meson.build > +++ b/meson.build > @@ -96,6 +96,8 @@ > endforeach > endif > > +bzip2 = find_program('bzip2', required: install_edk2_blobs) > + > ################## > # Compiler flags # > ################## > diff --git a/pc-bios/meson.build b/pc-bios/meson.build > index 6a341b6cea0..af95c5d1f1d 100644 > --- a/pc-bios/meson.build > +++ b/pc-bios/meson.build > @@ -1,5 +1,4 @@ > if install_edk2_blobs > - bzip2 = find_program('bzip2', required: true) > fds = [ > 'edk2-aarch64-code.fd', > 'edk2-arm-code.fd', > Right, this looks sensible; still it makes me think patch#1 is only prep for this. (That's OK, but then patch#1 should say so.) Reviewed-by: Laszlo Ersek Thanks laszlo