Re: [Qemu-devel] [PATCH 3/7] ipxe: add local patches

[Andreas Färber]

Am 10.04.2015 um 16:17 schrieb Gerd Hoffmann:
> There are two ipxe patches needed to make efi pxe boots work.
> They didn't made it upstream yet, and I don't want to wait any
> longer with updating qemu.  So add them here, with some logic
> to apply them before building ipxe.
> 
> /me still hopes I can revert that patch some day.
> 
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  roms/Makefile                                      |  12 +-
>  ...rove-compliance-with-the-EFI_SIMPLE_NETWO.patch | 160 
> +++++++++++++++++++++
>  ...0002-efi-make-load-file-protocol-optional.patch | 102 +++++++++++++
>  3 files changed, 271 insertions(+), 3 deletions(-)
>  create mode 100644 
> roms/ipxe-patches/0001-efi_snp-improve-compliance-with-the-EFI_SIMPLE_NETWO.patch
>  create mode 100644 
> roms/ipxe-patches/0002-efi-make-load-file-protocol-optional.patch
> 
> diff --git a/roms/Makefile b/roms/Makefile
> index 461cb49..ab4532c 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -115,12 +115,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
>               -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
>               -o ../pc-bios/efi-$*.rom
>  
> -build-pxe-roms: ipxe/src/config/local/general.h
> +build-pxe-roms: ipxe/qemu-patches ipxe/src/config/local/general.h
>       $(MAKE) -C ipxe/src GITVERSION="" \
>               CROSS_COMPILE=$(x86_64_cross_prefix) \
>               $(patsubst %,bin/%.rom,$(pxerom_targets))
>  
> -build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
> +build-efi-roms: ipxe/qemu-patches build-pxe-roms 
> ipxe/src/config/local/general.h
>       $(MAKE) -C ipxe/src GITVERSION="" \
>               CROSS_COMPILE=$(x86_64_cross_prefix) \
>               $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
> @@ -129,6 +129,12 @@ build-efi-roms: build-pxe-roms 
> ipxe/src/config/local/general.h
>  ipxe/src/config/local/%: config.ipxe.%
>       cp $< $@
>  
> +ipxe/qemu-patches:

Looks like this is only ever removed by clean? Should depend on the
patch files, in case they change with an update.

But why are you adding patch files in the first place? Can't we just
push the commits to a branch on git.qemu-project.org and update the
submodule config accordingly?

Regards,
Andreas

> +     for patch in ipxe-patches/*; do \
> +             echo "# applying $$patch"; \
> +             cat $$patch | (cd ipxe; patch -p1); \
> +     done
> +     touch $@
>  
>  slof:
>       $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
> @@ -148,6 +154,6 @@ clean:
>       $(MAKE) -C sgabios clean
>       rm -f sgabios/.depend
>       $(MAKE) -C ipxe/src veryclean
> -     (cd ipxe; rm -f src/config/local/*.h)
> +     (cd ipxe; git reset --hard; rm -f qemu-patches src/config/local/*.h)
>       $(MAKE) -C SLOF clean
>       rm -rf u-boot/build.e500
[snip]

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)