[Qemu-devel] [PATCH 1/2] ipxe: add new roms to BLOBS

[Qemu-devel] [PATCH 1/2] ipxe: add new roms to BLOBS

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 7087fc2..5ea13bc 100644
--- a/Makefile
+++ b/Makefile
@@ -416,6 +416,7 @@ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
 efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
 efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
+efi-e1000e.rom efi-vmxnet3.rom \
 qemu-icon.bmp qemu_logo_no_text.svg \
 bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
 multiboot.bin linuxboot.bin kvmvapic.bin \
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/2] build: add pc-bios to config-host.mak deps

[Gerd Hoffmann]

... so configure re-runs on pc-bios updates such as new pxe roms.
Needed because configure symlinks the prebuilt roms from src
into build tree.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5ea13bc..c1ac21d 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CONFIG_ALL=y
 -include config-all-devices.mak
 -include config-all-disas.mak
 
-config-host.mak: $(SRC_PATH)/configure
+config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios
 	@echo $@ is out-of-date, running configure
 	@# TODO: The next lines include code which supports a smooth
 	@# transition from old configurations without config.status.
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 2/2] build: add pc-bios to config-host.mak deps

[Peter Maydell]

On 1 July 2016 at 12:34, Gerd Hoffmann <kraxel@redhat.com> wrote:
> ... so configure re-runs on pc-bios updates such as new pxe roms.
> Needed because configure symlinks the prebuilt roms from src
> into build tree.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 5ea13bc..c1ac21d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -30,7 +30,7 @@ CONFIG_ALL=y
>  -include config-all-devices.mak
>  -include config-all-disas.mak
>
> -config-host.mak: $(SRC_PATH)/configure
> +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios
>         @echo $@ is out-of-date, running configure
>         @# TODO: The next lines include code which supports a smooth
>         @# transition from old configurations without config.status.
> --
> 1.8.3.1

This is ok as a quick fix for the moment, but I think longer term
the right way to fix this problem is to stop doing build-time
stuff (copying files from the src to the build dir) in configure,
and do it in make instead.

thanks
-- PMM