configure: Only decompress EDK2 blobs and check for bzip2 for X86/ARM
v2 cover configure: Only decompress EDK2 blobs and check for bzip2 for X86/ARM
This series fixes a bug reported by Thomas: bzip2 is (only) required to decompress the EDK2 blobs, which target the ARM/X86 archs.
First restrict the blobs decompression to their targets (we don't need to decompress them when not building X86/ARM).
Then check bzip2 is available.
Philippe Mathieu-Daudé (2):
configure: Only decompress EDK2 blobs for X86/ARM targets
configure: Check bzip2 is available
Makefile | 2 ++ configure | 17 +++++++++++++++++ 2 files changed, 19 insertions(+)
Signature · 1 line
2.21.0
PATCH v2 1/2 configure: Only decompress EDK2 blobs for X86/ARM targets
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.
---
v2: new
--- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+)
Makefile +2 -0
@@ -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 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
configure +13 -0
@@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes"
@@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2
@@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Signature · 1 line
2.21.0
Re: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets
Quoted 7 lines · Philippe Mathieu-Daudé
The EDK2 firmware blobs only target the X86/ARM architectures. Define the
DECOMPRESS_EDK2_BLOBSvariable and only decompress the blobs when the variable exists.Fixes 536d2173b2bSuggested-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 6 lines
---
v2: new--- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
The EDK2 firmware blobs only target the X86/ARM architectures. Define the
DECOMPRESS_EDK2_BLOBSvariable and only decompress the blobs when the variable exists.
Quoted 8 lines
Fixes 536d2173b2bSuggested-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: new--- Makefile | 2 ++ configure | 13 +++++++++++++
Oops sorry, new workspace, I hadn't installed scripts/git.orderfile.
Quoted 55 lines
2 files changed, 15 insertions(+)Makefile +2
-0@@ -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 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so thatconfigure +13
-0@@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes"@@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2@@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Re: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
The EDK2 firmware blobs only target the X86/ARM architectures. Define the
DECOMPRESS_EDK2_BLOBSvariable and only decompress the blobs when the variable exists.Fixes 536d2173b2bSuggested-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 6 lines
---
v2: new--- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+)
- Wainer
Quoted 53 lines
Makefile +2
-0@@ -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 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so thatconfigure +13
-0@@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes"@@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2@@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Re: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets
In reply to Philippe Mathieu-DaudéQuoted 57 lines · Philippe Mathieu-Daudé
The EDK2 firmware blobs only target the X86/ARM architectures. Define the
DECOMPRESS_EDK2_BLOBSvariable and only decompress the blobs when the variable exists.Fixes 536d2173b2bSuggested-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: new--- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+)Makefile +2
-0@@ -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 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so thatconfigure +9
-0@@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes"@@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2
configure if test "$libudev" != "no"; then · line 7544
Quoted 10 lines
configure +4
-0@@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Re: [PATCH v2 1/2] configure: Only decompress EDK2 blobs for X86/ARM targets
In reply to Philippe Mathieu-DaudéQuoted 57 lines · Philippe Mathieu-Daudé
The EDK2 firmware blobs only target the X86/ARM architectures. Define the
DECOMPRESS_EDK2_BLOBSvariable and only decompress the blobs when the variable exists.Fixes 536d2173b2bSuggested-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: new--- Makefile | 2 ++ configure | 13 +++++++++++++ 2 files changed, 15 insertions(+)Makefile +2
-0@@ -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 .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so thatconfigure +9
-0@@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes"@@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2
configure if test "$libudev" != "no"; then · line 7544
Quoted 10 lines
configure +4
-0@@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Impressively surgical & simple.
Thank you!
Laszlo
PATCH v2 2/2 configure: Check bzip2 is available
In reply to Philippe Mathieu-Daudé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.
---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)
--- configure | 4 ++++ 1 file changed, 4 insertions(+)
configure +4 -0
@@ -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
Signature · 1 line
2.21.0
Re: [PATCH v2 2/2] configure: Check bzip2 is available
Quoted 27 lines · Philippe Mathieu-Daudé
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 536d2173b2bReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)--- configure | 4 ++++ 1 file changed, 4 insertions(+)configure +0
-0
configure case " $target_list " in · line 2150
Quoted 4 lines
configure +1
-0@@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac +# Some firmware binaries are compressed with bzip2
Squash into previous patch
configure for target in $target_list; do · line 2163
Quoted 13 lines
configure +3
-0for 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
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Wainer dos Santos Moschetta
Reviewed-byRe: [PATCH v2 2/2] configure: Check bzip2 is available
Quoted 30 lines · Daniel P. Berrangé
Quoted 29 lines · Philippe Mathieu-Daudé
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 536d2173b2bReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)--- configure | 4 ++++ 1 file changed, 4 insertions(+)configure +0
-0@@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac
Quoted 2 lines
configure case " $target_list " in · line 2150
Quoted 1 line
configure +1
-0+# Some firmware binaries are compressed with bzip2Squash into previous patch
Ditto.
Quoted 12 lines
Quoted 12 lines
configure +3
-0for 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
Quoted 3 lines
configure for target in $target_list; do · line 2163
Quoted 2 lines
configure +0
-0feature_not_found() { feature=$1Reviewed-by Daniel P. Berrangé <[email protected]>
- Wainer
Quoted 4 lines
Regards,
Daniel
Laszlo Ersek
Reviewed-byRe: [PATCH v2 2/2] configure: Check bzip2 is available
In reply to Daniel P. BerrangéQuoted 46 lines · Daniel P. Berrangé
Quoted 27 lines · Philippe Mathieu-Daudé
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 536d2173b2bReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)--- configure | 4 ++++ 1 file changed, 4 insertions(+)configure +0
-0configure case " $target_list " in · line 2150
Quoted 4 lines
configure +1
-0@@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac +# Some firmware binaries are compressed with bzip2Squash into previous patch
Quoted 11 lines
configure +3
-0for 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
Quoted 4 lines
configure for target in $target_list; do · line 2163
Quoted 2 lines
configure +0
-0feature_not_found() { feature=$1Reviewed-by Daniel P. Berrangé <[email protected]>
I don't feel too strongly about this, but how about a different improvement:
- keep the comment in this patch, but move it right before the "has bzip2" check
- instead of "some firmware binaries", clearly state "edk2 blobs".
Something like:
+# Edk2 blobs are compressed with bzip2.
+if test "$edk2_blobs" = "yes" && ! has bzip2; then
+ error_exit "The bzip2 program is required for building QEMU" +fi
So... now we have three variants: the one posted by Phil (v2), the one recommended by Dan (as an update to v2), and the one I suggest above (as a different update to v2). For simplicity, I'm fine with any one of the three variants going in.
Thanks!
Laszlo
Re: [PATCH v2 2/2] configure: Check bzip2 is available
Quoted 65 lines · Laszlo Ersek
Quoted 46 lines · Daniel P. Berrangé
Quoted 27 lines · Philippe Mathieu-Daudé
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 536d2173b2bReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)--- configure | 4 ++++ 1 file changed, 4 insertions(+)configure +0
-0configure case " $target_list " in · line 2150
Quoted 4 lines
configure +1
-0@@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac +# Some firmware binaries are compressed with bzip2Squash into previous patch
Quoted 11 lines
configure +3
-0for 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" +fiQuoted 4 lines
configure for target in $target_list; do · line 2163
Quoted 2 lines
configure +0
-0feature_not_found() { feature=$1Reviewed-by Daniel P. Berrangé <[email protected]>I don't feel too strongly about this, but how about a different improvement:
- keep the comment in this patch, but move it right before the "has bzip2" check
- instead of "some firmware binaries", clearly state "edk2 blobs".Something like:
configure +4
-0+# Edk2 blobs are compressed with bzip2. +if test "$edk2_blobs" = "yes" && ! has bzip2; then + error_exit "The bzip2 program is required for building QEMU" +fi
Quoted 4 lines
So... now we have three variants: the one posted by Phil (v2), the one recommended by Dan (as an update to v2), and the one I suggest above (as a different update to v2). For simplicity, I'm fine with any one of the three variants going in.
I'll add the two patches to my "qtest + misc" PULL request that I'm planning to send out tomorrow - and use Laszlo's suggestion for moving the comment. I hope that's fine for everybody, if not please complain.
Thomas
Re: [PATCH v2 2/2] configure: Check bzip2 is available
In reply to Philippe Mathieu-DaudéQuoted 27 lines · Philippe Mathieu-Daudé
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 536d2173b2bReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: use better English (Daniel)
(Not taking Daniel Reviewed-by because logic changed)--- configure | 4 ++++ 1 file changed, 4 insertions(+)configure +0
-0
configure case " $target_list " in · line 2150
Quoted 4 lines
configure +1
-0@@ -2147,6 +2147,7 @@ case " $target_list " in ;; esac +# Some firmware binaries are compressed with bzip2
With this comment squashed in previous commit:
Quoted 14 lines
configure +3
-0for 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