update ipxe binaries, re-enable efi pxe ROMs

diff --git a/Makefile b/Makefile
index 8f4eab49c5c80aceb4c5cb0691dde6106c840b2f..5bdba536fad4f476a06d0b2ae8f2791f87b77b07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ download:
        #git clone git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
        git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
        cd ${KVMDIR}; git checkout v2.4.0.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+       # update ipxe binaries
+       cd ${KVMDIR}; git cherry-pick f4798320144245da66128edb840bd940fd287d28
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}

diff --git a/debian/patches/series b/debian/patches/series
index 68ce08fdc2cb82cca7df911067d49cfd8c5ce2bc..465145ad464d52543e1e5283a346fb72766dfa08 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,7 +24,7 @@ backup-vma-remove-async-queue.patch
 backup-run-flush-inside-coroutine.patch
 backup-do-not-use-bdrv-drain-all.patch
 internal-snapshot-async.patch
-disable-efi-enable-pxe-roms.patch
+#disable-efi-enable-pxe-roms.patch
 backup-vma-allow-empty-backups.patch
 backup-vma-extract-add-block-driver-type.patch
 glusterfs-daemonize.patch

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index efd9c331a43cc2758ec614a594363aa988e24bf5..8397426c4d892786c9a89b2bbe316c749994e3d0 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ