[pve-devel] r6459 - pve-qemu-kvm/pve2/debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-11 10:36:55 +0200 (Thu, 11 Aug 2011)
New Revision: 6459

Modified:
   pve-qemu-kvm/pve2/debian/changelog
   pve-qemu-kvm/pve2/debian/rules
Log:
  * do not use --disable-blobs (let qemu-kvm install files, and we remove
    what we do not need)



Modified: pve-qemu-kvm/pve2/debian/changelog
===================================================================
--- pve-qemu-kvm/pve2/debian/changelog	2011-08-11 08:20:18 UTC (rev 6458)
+++ pve-qemu-kvm/pve2/debian/changelog	2011-08-11 08:36:55 UTC (rev 6459)
@@ -3,6 +3,9 @@
   * update to upstream 0.15.0
 
   * use pxe roms from upstream qemu-kvm
+  
+  * do not use --disable-blobs (let qemu-kvm install files, and we remove
+    what we do not need)
 
  -- Proxmox Support Team <support at proxmox.com>  Thu, 11 Aug 2011 10:00:44 +0200
 

Modified: pve-qemu-kvm/pve2/debian/rules
===================================================================
--- pve-qemu-kvm/pve2/debian/rules	2011-08-11 08:20:18 UTC (rev 6458)
+++ pve-qemu-kvm/pve2/debian/rules	2011-08-11 08:36:55 UTC (rev 6459)
@@ -33,7 +33,7 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --disable-blobs --enable-vnc-tls --enable-sdl
+	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --enable-vnc-tls --enable-sdl
 
 build: patch build-stamp
 
@@ -81,18 +81,15 @@
 
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
+	# we do not need openbios files (sparc/ppc)
+	rm -rf $(destdir)/usr/share/kvm/openbios-*
+	# remove ppc files
+	rm $(destdir)/usr/share/kvm/*.dtb
+	rm $(destdir)/usr/share/kvm/ppc_rom.bin
+	rm $(destdir)/usr/share/kvm/s390-zipl.rom
+	rm $(destdir)/usr/share/kvm/slof.bin
+	rm $(destdir)/usr/share/kvm/spapr-rtas.bin
 
-	# install gPXE bios images
-	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; \
-	done
-
-	for f in linuxboot extboot multiboot vapic; do \
-		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