From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 22 Oct 2015 06:45:31 +0000 (+0200)
Subject: update ipxe binaries, re-enable efi pxe ROMs
X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=commitdiff_plain;h=3d265b4e6f7135f535682dc6b60ccb396076523a

update ipxe binaries, re-enable efi pxe ROMs
---

diff --git a/Makefile b/Makefile
index 8f4eab4..5bdba53 100644
--- 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 68ce08f..465145a 100644
--- 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 efd9c33..8397426 100644
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ