qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Laszlo Ersek <lersek@redhat.com>
Cc: qemu-trivial@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v2 2/2] configure: Check bzip2 is available
Date: Fri,  8 Nov 2019 12:45:31 +0100	[thread overview]
Message-ID: <20191108114531.21518-3-philmd@redhat.com> (raw)
In-Reply-To: <20191108114531.21518-1-philmd@redhat.com>

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 <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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
 
+# 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" = "yes" && ! has bzip2; then
+  error_exit "The bzip2 program is required for building QEMU"
+fi
 
 feature_not_found() {
   feature=$1
-- 
2.21.0



  parent reply	other threads:[~2019-11-08 11:48 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-08 11:45 [PATCH v2 0/2] configure: Only decompress EDK2 blobs and check for bzip2 for X86/ARM Philippe Mathieu-Daudé
2019-11-08 11:45 ` [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets Philippe Mathieu-Daudé
2019-11-08 11:47   ` Daniel P. Berrangé
2019-11-08 11:49   ` Philippe Mathieu-Daudé
2019-11-08 13:32   ` Wainer dos Santos Moschetta
2019-11-08 14:02   ` Luc Michel
2019-11-08 17:38   ` Laszlo Ersek
2019-11-08 11:45 ` Philippe Mathieu-Daudé [this message]
2019-11-08 11:48   ` [PATCH v2 2/2] configure: Check bzip2 is available Daniel P. Berrangé
2019-11-08 13:33     ` Wainer dos Santos Moschetta
2019-11-08 17:43     ` Laszlo Ersek
2019-11-11 13:38       ` Thomas Huth
2019-11-08 14:04   ` Luc Michel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191108114531.21518-3-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=berrange@redhat.com \
    --cc=lersek@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).