tests/docker/docker.py: check and run .pre script

[mirror_qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 9d12dc614fdc8812dd804d2fa601487b64c0387c..0d7647f796aeb443afc85716b987d3ed3da9e2cc 100644 (file)
--- 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.
@@ -185,7 +185,7 @@ qemu-version.h: FORCE
                                printf '""\n'; \
                        fi; \
                fi) > $@.tmp)
-       $(call quiet-command, cmp --quiet $@ $@.tmp || mv $@.tmp $@)
+       $(call quiet-command, cmp -s $@ $@.tmp || mv $@.tmp $@)
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
@@ -416,9 +416,10 @@ 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 \
+multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \
 s390-ccw.img \
 spapr-rtas.bin slof.bin \
 palcode-clipper \