[pve-devel] r5285 - in pve-qemu-kvm/trunk: . debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-25 11:50:56 +0000 (Mon, 25 Oct 2010)
New Revision: 5285

Modified:
   pve-qemu-kvm/trunk/Makefile
   pve-qemu-kvm/trunk/debian/changelog
   pve-qemu-kvm/trunk/debian/rules
Log:


Modified: pve-qemu-kvm/trunk/Makefile
===================================================================
--- pve-qemu-kvm/trunk/Makefile	2010-10-25 11:16:27 UTC (rev 5284)
+++ pve-qemu-kvm/trunk/Makefile	2010-10-25 11:50:56 UTC (rev 5285)
@@ -2,7 +2,7 @@
 
 # also update debian/changelog
 KVMVER=0.13.0
-KVMPKGREL=1
+KVMPKGREL=2
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -25,8 +25,6 @@
 ${KVM_DEB} kvm: ${KVMDIR}.org/README
 	rm -rf ${KVMDIR}
 	cp -a ${KVMDIR}.org ${KVMDIR}
-	#	mkdir -p /lib/modules/${KVNAME}
-	#ln -sf ${TOP}/linux-2.6.24-openvz /lib/modules/${KVNAME}/build
 	cp -a debian ${KVMDIR}/debian
 	cd ${KVMDIR}; dpkg-buildpackage -rfakeroot -us -uc
 	lintian ${KVM_DEB} || true

Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2010-10-25 11:16:27 UTC (rev 5284)
+++ pve-qemu-kvm/trunk/debian/changelog	2010-10-25 11:50:56 UTC (rev 5285)
@@ -1,3 +1,12 @@
+pve-qemu-kvm (0.13.0-2) unstable; urgency=low
+
+  * do not install unnecessary blobs (manually install blobs, use
+    --disable-blobs)
+
+  * update migration and vnc keymap patches for 0.13.0
+  
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 25 Oct 2010 13:46:03 +0200
+
 pve-qemu-kvm (0.13.0-1) unstable; urgency=low
 
   * update to qemu-kvm-0.13.0

Modified: pve-qemu-kvm/trunk/debian/rules
===================================================================
--- pve-qemu-kvm/trunk/debian/rules	2010-10-25 11:16:27 UTC (rev 5284)
+++ pve-qemu-kvm/trunk/debian/rules	2010-10-25 11:50:56 UTC (rev 5285)
@@ -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
+	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --disable-blobs
 
 	cd kvm/test && ./configure --prefix=/usr
 
@@ -89,15 +89,17 @@
 	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
 
-	# install gPXE bios image
-	rm $(destdir)/usr/share/kvm/pxe-*.bin;
+	# install gPXE bios images
 	install -m0644 debian/roms/*.bin $(destdir)/usr/share/kvm
 
-	# rm ppc files
-	rm $(destdir)/usr/share/kvm/*.dtb
-	# rm openbios ppc and sparc
-	rm $(destdir)/usr/share/kvm/openbios-*
+	for f in bios vgabios vgabios-cirrus; 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 things we don't package at all, would be a "kvm-dev" package
 	rm -Rf $(destdir)/usr/include/linux/
 	rm -Rf $(destdir)/usr/include