From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org, Laszlo Ersek <lersek@redhat.com>, Olaf Hering <olaf@aepfle.de> Cc: "Igor Mammedov" <imammedo@redhat.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Michael S . Tsirkin" <mst@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PATCH for-4.0 v2 2/2] roms: Allow the EDK2_EFIROM variable to be overridden Date: Fri, 5 Apr 2019 17:33:14 +0200 [thread overview] Message-ID: <20190405153314.2068-3-philmd@redhat.com> (raw) In-Reply-To: <20190405153314.2068-1-philmd@redhat.com> Since commit f590a812c210 we build the EDK2 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 EDK2_EFIROM variable. [*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- roms/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index d28252dafdf..ea19aa9b33c 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -47,7 +47,11 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" # We need that to combine multiple images (legacy bios, # efi ia32, efi x64) into a single rom binary. # -EDK2_EFIROM = edk2/BaseTools/Source/C/bin/EfiRom +# By default we build the latest EDK2 stable EfiRom utility. +# If you have to use another one, you can also pass the location on +# the command line, i.e. "make EDK2_EFIROM=$(type -P EfiRom) efirom" +# +EDK2_EFIROM ?= edk2/BaseTools/Source/C/bin/EfiRom default: @echo "nothing is build by default" @@ -120,8 +124,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 $(EDK2_EFIROM) if the variable is overridden +ifeq "$(origin EDK2_EFIROM)" "file" $(EDK2_EFIROM): $(MAKE) -C edk2/BaseTools +endif slof: $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org, Laszlo Ersek <lersek@redhat.com>, Olaf Hering <olaf@aepfle.de> Cc: "Igor Mammedov" <imammedo@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Michael S . Tsirkin" <mst@redhat.com> Subject: [Qemu-devel] [PATCH for-4.0 v2 2/2] roms: Allow the EDK2_EFIROM variable to be overridden Date: Fri, 5 Apr 2019 17:33:14 +0200 [thread overview] Message-ID: <20190405153314.2068-3-philmd@redhat.com> (raw) Message-ID: <20190405153314.oCC5y5SHPutYZXPl9QqaVYYrNU0p6jWL6ESM2TS6Dpc@z> (raw) In-Reply-To: <20190405153314.2068-1-philmd@redhat.com> Since commit f590a812c210 we build the EDK2 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 EDK2_EFIROM variable. [*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- roms/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index d28252dafdf..ea19aa9b33c 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -47,7 +47,11 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" # We need that to combine multiple images (legacy bios, # efi ia32, efi x64) into a single rom binary. # -EDK2_EFIROM = edk2/BaseTools/Source/C/bin/EfiRom +# By default we build the latest EDK2 stable EfiRom utility. +# If you have to use another one, you can also pass the location on +# the command line, i.e. "make EDK2_EFIROM=$(type -P EfiRom) efirom" +# +EDK2_EFIROM ?= edk2/BaseTools/Source/C/bin/EfiRom default: @echo "nothing is build by default" @@ -120,8 +124,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 $(EDK2_EFIROM) if the variable is overridden +ifeq "$(origin EDK2_EFIROM)" "file" $(EDK2_EFIROM): $(MAKE) -C edk2/BaseTools +endif slof: $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu -- 2.20.1
next prev parent reply other threads:[~2019-04-05 15:34 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-05 15:33 [Qemu-devel] [PATCH for-4.0 v2 0/2] roms: Rename the EFIROM variable and let it be overridable Philippe Mathieu-Daudé 2019-04-05 15:33 ` Philippe Mathieu-Daudé 2019-04-05 15:33 ` [Qemu-devel] [PATCH for-4.0 v2 1/2] roms: Rename the EFIROM variable to avoid clashing with iPXE Philippe Mathieu-Daudé 2019-04-05 15:33 ` Philippe Mathieu-Daudé 2019-04-08 10:54 ` Laszlo Ersek 2019-04-05 15:33 ` Philippe Mathieu-Daudé [this message] 2019-04-05 15:33 ` [Qemu-devel] [PATCH for-4.0 v2 2/2] roms: Allow the EDK2_EFIROM variable to be overridden Philippe Mathieu-Daudé 2019-04-08 11:05 ` Laszlo Ersek 2019-04-10 6:25 ` Olaf Hering 2019-04-10 6:25 ` Olaf Hering 2019-04-10 14:54 ` Laszlo Ersek 2019-04-10 14:54 ` Laszlo Ersek 2019-04-08 9:02 ` [Qemu-devel] [PATCH for-4.0 v2 0/2] roms: Rename the EFIROM variable and let it be overridable Laszlo Ersek 2019-04-08 9:02 ` Laszlo Ersek 2019-04-08 9:20 ` Laszlo Ersek 2019-04-08 9:20 ` Laszlo Ersek
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=20190405153314.2068-3-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=imammedo@redhat.com \ --cc=kraxel@redhat.com \ --cc=lersek@redhat.com \ --cc=mst@redhat.com \ --cc=olaf@aepfle.de \ --cc=qemu-devel@nongnu.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.