[pve-devel] r6456 - pve-qemu-kvm/trunk/debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-11 09:26:40 +0200 (Thu, 11 Aug 2011)
New Revision: 6456

Removed:
   pve-qemu-kvm/trunk/debian/roms/
Modified:
   pve-qemu-kvm/trunk/debian/changelog
   pve-qemu-kvm/trunk/debian/rules
Log:
  * use pxe roms from upstream qemu-kvm



Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2011-08-11 06:03:50 UTC (rev 6455)
+++ pve-qemu-kvm/trunk/debian/changelog	2011-08-11 07:26:40 UTC (rev 6456)
@@ -1,6 +1,8 @@
 pve-qemu-kvm (0.15.0-1) unstable; urgency=low
 
   * update to upstream 0.15.0
+  
+  * use pxe roms from upstream qemu-kvm
 
  -- Proxmox Support Team <support at proxmox.com>  Thu, 11 Aug 2011 07:41:20 +0200
 

Modified: pve-qemu-kvm/trunk/debian/rules
===================================================================
--- pve-qemu-kvm/trunk/debian/rules	2011-08-11 06:03:50 UTC (rev 6455)
+++ pve-qemu-kvm/trunk/debian/rules	2011-08-11 07:26:40 UTC (rev 6456)
@@ -83,7 +83,7 @@
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
 
 	# install gPXE bios images
-	install -m0644 debian/roms/*.bin $(destdir)/usr/share/kvm
+	install -m0644 $(CURDIR)/pc-bios/pxe-*.rom $(destdir)/usr/share/kvm
 
 	for f in bios vgabios vgabios-cirrus vgabios-qxl vgabios-stdvga vgabios-vmware; do \
 		install -m 0644 pc-bios/$$f.bin $(destdir)/usr/share/kvm/$$f.bin; \
@@ -93,6 +93,9 @@
 		install -m 0644 pc-bios/optionrom/$$f.bin $(destdir)/usr/share/kvm/$$f.bin; \
 	done
 
+	# remove guest agent (that is only required for a guest)
+	rm $(destdir)/usr/bin/qemu-ga
+
 	# Remove things we don't package at all, would be a "kvm-dev" package
 	rm -Rf $(destdir)/usr/include/linux/
 	rm -Rf $(destdir)/usr/include