From nobody Tue Apr 23 13:51:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573213710; cv=none; d=zoho.com; s=zohoarc; b=HQcnBhvBnEbE6zGJjnml4ftJL4G9qI+8+E0urBbq9WiIiTKRDax9Nh0eAhtesVxmom34Rg16xi7moYY41ZIVhw2fuYTo++lmIJXoNWRcXgCxut4/WUYxR6dfbZYA2N+ut7zqao8LH5df3+A+RUAMIFPiIbVx6qKrwex7jCbwvjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573213710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aJnWIXoyf8uDx5hjcLNg2oTG455ZakYUGaXxT7IgzWA=; b=l0fK8r261USI2Yx5+H7v/dc3PWmDFLkvUxTqN44vohqZPmWAbFAi0KdfEfdpE4ObGraI9BqT2WI8hCRI1p4mw0bfasHG9UIMRTFrr1s7Dr/rUkq7FQ4Qm7rLvKxvn0NQ9S4VZ7/osqpu7aetE200RCxTlX+d/rIWgeE28ipLeec= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573213710635107.7196061008699; Fri, 8 Nov 2019 03:48:30 -0800 (PST) Received: from localhost ([::1]:52708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT2kf-0001ws-7O for importer@patchew.org; Fri, 08 Nov 2019 06:48:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35691) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT2i8-0000Ld-SE for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT2i7-0005Re-Qk for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:52 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57868 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 1iT2i7-0005RO-NZ for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:51 -0500 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-289-vL4eeN3yNE2xxX17VOv3mg-1; Fri, 08 Nov 2019 06:45:48 -0500 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 3EE3A477; Fri, 8 Nov 2019 11:45:47 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C2F7600C9; Fri, 8 Nov 2019 11:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573213551; 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=aJnWIXoyf8uDx5hjcLNg2oTG455ZakYUGaXxT7IgzWA=; b=EcjpOji7aEH8xE78rdjbKT4WNdEMtDgeBjh5UbOL/KU/Uf1MewA8gxMuu6DR41LrDd6bql nUM2mJri1I+AsNNpMn31oWnV8E1jlabq23NRIeYDnSr2WfS0hAvrVhnFBHOO+sHJGR63Ua lZH/hdKTo8PbyZ7qxZPLlxCI5LrMjiQ= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Laszlo Ersek Subject: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets Date: Fri, 8 Nov 2019 12:45:30 +0100 Message-Id: <20191108114531.21518-2-philmd@redhat.com> In-Reply-To: <20191108114531.21518-1-philmd@redhat.com> References: <20191108114531.21518-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: vL4eeN3yNE2xxX17VOv3mg-1 X-Mimecast-Spam-Score: 0 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: 207.211.31.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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , "Daniel P . Berrange" , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The EDK2 firmware blobs only target the X86/ARM architectures. Define the DECOMPRESS_EDK2_BLOBS variable and only decompress the blobs when the variable exists. Fixes: 536d2173b2b Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laszlo Ersek Reviewed-by: Luc Michel Reviewed-by: Wainer dos Santos Moschetta --- v2: new --- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index aa9d1a42aa..3430eca532 100644 --- a/Makefile +++ b/Makefile @@ -480,7 +480,9 @@ $(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 +ifdef DECOMPRESS_EDK2_BLOBS $(SOFTMMU_ALL_RULES): $(edk2-decompressed) +endif =20 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that diff --git a/configure b/configure index efe165edf9..9b322284c3 100755 --- a/configure +++ b/configure @@ -427,6 +427,7 @@ softmmu=3D"yes" linux_user=3D"no" bsd_user=3D"no" blobs=3D"yes" +edk2_blobs=3D"no" pkgversion=3D"" pie=3D"" qom_cast_debug=3D"yes" @@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac =20 +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs=3D"yes" + ;; + esac +done + feature_not_found() { feature=3D$1 remedy=3D$2 @@ -7526,6 +7535,10 @@ if test "$libudev" !=3D "no"; then echo "LIBUDEV_LIBS=3D$libudev_libs" >> $config_host_mak fi =20 +if test "$edk2_blobs" =3D "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=3Dy" >> $config_host_mak +fi + # use included Linux headers if test "$linux" =3D "yes" ; then mkdir -p linux-headers --=20 2.21.0 From nobody Tue Apr 23 13:51:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573213702; cv=none; d=zoho.com; s=zohoarc; b=U6sRjhs24bgjbT39L5NRKzNnllGKHiST9em58413EQ2iH2T8MJj+SexIVNMGdvDxApZrJ8hNHtnzM1lp/t7IiOOIua9Fgs1SBEq8YEE8mC007Pld1jJz+XtQ+xp/wUE29MaogJUIms8fuFi7SsvqtHa7XWw7PavekkipU7bBgtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573213702; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cYk861gpC556EgkJCnEz6rjQ4KpNOr1kPb/DgPho6tQ=; b=exQrvJl+9TpsY6p7kcQ7HKA/9N8vS4id2WU2C/LFssXDLUxwjg7xRTEm/uwPWCIr3MipNdECHDirW8RsULSfZKwkx7kOuO1Kf4YJyWwbUa4r6ekoISk1Bqa17NDH209bb/4epKVsIvqHqwuetGmPqGNoVD2x++nj4u1eSSdi3Pw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573213702471207.48659961945577; Fri, 8 Nov 2019 03:48:22 -0800 (PST) Received: from localhost ([::1]:52706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT2kS-0001fK-8j for importer@patchew.org; Fri, 08 Nov 2019 06:48:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35706) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT2iA-0000OR-SJ for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT2i9-0005TM-PN for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:54 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21753 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iT2i9-0005Sn-LW for qemu-devel@nongnu.org; Fri, 08 Nov 2019 06:45:53 -0500 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-30-uFJ5HhKZPMGOmmm9K39daw-1; Fri, 08 Nov 2019 06:45:51 -0500 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 82CE0800A1A; Fri, 8 Nov 2019 11:45:50 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE22D600C9; Fri, 8 Nov 2019 11:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573213552; 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=cYk861gpC556EgkJCnEz6rjQ4KpNOr1kPb/DgPho6tQ=; b=bWbJC8BHqAwx2yIOAHKe0onT5yc8eNsHqgJ2c6RNwf/MbMe5ZFSj10Tz5TAq2Rx8v56820 keZs+L2AFxT3qUMB+yoh+I6jSg8zkRklJKRHV7m7hwN+NTHcHbcspbJwNS/c6cfEsENGTk +9Oo3h2bnDnfZdxp+04cPeHNQFz0E0Y= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Laszlo Ersek Subject: [PATCH v2 2/2] configure: Check bzip2 is available Date: Fri, 8 Nov 2019 12:45:31 +0100 Message-Id: <20191108114531.21518-3-philmd@redhat.com> In-Reply-To: <20191108114531.21518-1-philmd@redhat.com> References: <20191108114531.21518-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: uFJ5HhKZPMGOmmm9K39daw-1 X-Mimecast-Spam-Score: 0 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.61 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , "Daniel P . Berrange" , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The bzip2 tool is not included in default installations. On freshly installed systems, ./configure succeeds but 'make' might fail later: BUNZIP2 pc-bios/edk2-i386-secure-code.fd.bz2 /bin/sh: bzip2: command not found make: *** [Makefile:305: pc-bios/edk2-i386-secure-code.fd] Error 127 make: *** Deleting file 'pc-bios/edk2-i386-secure-code.fd' make: *** Waiting for unfinished jobs.... Add a check in ./configure to warn the user if bzip2 is missing. Fixes: 536d2173b2b Reported-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laszlo Ersek Reviewed-by: Luc Michel Reviewed-by: Wainer dos Santos Moschetta --- v2: use better English (Daniel) (Not taking Daniel Reviewed-by because logic changed) --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 9b322284c3..2b419a8039 100755 --- a/configure +++ b/configure @@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac =20 +# Some firmware binaries are compressed with bzip2 for target in $target_list; do case "$target" in arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) @@ -2154,6 +2155,9 @@ for target in $target_list; do ;; esac done +if test "$edk2_blobs" =3D "yes" && ! has bzip2; then + error_exit "The bzip2 program is required for building QEMU" +fi =20 feature_not_found() { feature=3D$1 --=20 2.21.0