Since commit f590a812c210 we build the EfiRom utility unconditionally. This has been tested on all the Linux distribution providing continuous integration (namely Debian and Fedora). Not all distributions are able to build the EfiRom without specific patches (In particular SUSE which enforces the PIE protection, see [*]). Restore the possibility to other distributions to override the EFIROM variable.
[*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering <o...@aepfle.de> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- roms/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index 78d5dd18c30..0bcfa665ccf 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -47,7 +47,7 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" # We need that to combine multiple images (legacy bios, # efi ia32, efi x64) into a single rom binary. # -EFIROM = edk2/BaseTools/Source/C/bin/EfiRom +EFIROM ?= edk2/BaseTools/Source/C/bin/EfiRom default: @echo "nothing is build by default" @@ -120,8 +120,11 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) +# Do not compile $(EFIROM) if the variable is overridden +ifeq "$(origin EFIROM)" "file" $(EFIROM): $(MAKE) -C edk2/BaseTools +endif slof: $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu -- 2.20.1
