[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/10] roms/Makefile: replace the $(EFIROM) targ
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH 06/10] roms/Makefile: replace the $(EFIROM) target with "edk2-basetools" |
Date: |
Sat, 9 Mar 2019 02:53:33 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 |
On 3/9/19 2:32 AM, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
>
> On 3/9/19 1:48 AM, Laszlo Ersek wrote:
>> We don't (can't) have a recipe for building just $(EFIROM); therefore,
>> while we call the target $(EFIROM), we actually build all of the edk2
>> BaseTools. Rename the target to edk2-basetools, and update the iPXE
>> prerequisite accordingly. This will let other targets depend on
>> "edk2-basetools", where an $(EFIROM) pre-requisite would be misleading.
>>
>> Signed-off-by: Laszlo Ersek <address@hidden>
>> ---
>> roms/Makefile | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/roms/Makefile b/roms/Makefile
>> index 78d5dd18c301..2e83ececa25a 100644
>> --- a/roms/Makefile
>> +++ b/roms/Makefile
>> @@ -102,7 +102,7 @@ pxe-rom-%: build-pxe-roms
>>
>> efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
>>
>> -efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM)
>> +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools
>> $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
>> -b ipxe/src/bin/$(VID)$(DID).rom \
>> -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
>> @@ -120,7 +120,7 @@ build-efi-roms: build-pxe-roms
>> $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
>> $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
>>
>> -$(EFIROM):
>> +edk2-basetools:
>
> Should we add:
>
> $(MAKE) -f Makefile.edk2 submodules
>
> from your next patch?
>
> There might be a circular dependency else, if the user doesn't init the
> submodules manually.
>
> The next patch add a make dependency 'efi' -> 'edk2-basetools', but
> 'edk2-basetools' build the BaseTools within edk2/.
>
OK I mixed, the Makefile.edk2's submodules rules is for the edk2
repository submodules, while by 'the user submodules' I mean the QEMU
submodules...
So the user has to initialize the roms/edk2 submodule previous to run
both efi/edk2-basetools rules of this Makefile.
>> $(MAKE) -C edk2/BaseTools
>>
>> slof:
>>
- [Qemu-devel] [PATCH 02/10] roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64, (continued)
- [Qemu-devel] [PATCH 02/10] roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64, Laszlo Ersek, 2019/03/08
- [Qemu-devel] [PATCH 03/10] tests/uefi-test-tools/build.sh: work around TianoCore#1607, Laszlo Ersek, 2019/03/08
- [Qemu-devel] [PATCH 04/10] roms/edk2: advance to tag edk2-stable201903, Laszlo Ersek, 2019/03/08
- [Qemu-devel] [PATCH 05/10] roms/edk2-funcs.sh: add the qemu_edk2_get_thread_count() function, Laszlo Ersek, 2019/03/08
- [Qemu-devel] [PATCH 06/10] roms/Makefile: replace the $(EFIROM) target with "edk2-basetools", Laszlo Ersek, 2019/03/08
[Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Laszlo Ersek, 2019/03/08
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Philippe Mathieu-Daudé, 2019/03/09
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Philippe Mathieu-Daudé, 2019/03/10
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Eric Blake, 2019/03/11
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Laszlo Ersek, 2019/03/12
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Eric Blake, 2019/03/12
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Laszlo Ersek, 2019/03/12
- Re: [Qemu-devel] [PATCH 07/10] roms: build edk2 firmware binaries and variable store templates, Philippe Mathieu-Daudé, 2019/03/12