[pve-devel] r6127 - in pve-qemu-kvm/pve2: . debian debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-21 06:41:23 +0200 (Tue, 21 Jun 2011)
New Revision: 6127

Removed:
   pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff
Modified:
   pve-qemu-kvm/pve2/Makefile
   pve-qemu-kvm/pve2/debian/changelog
   pve-qemu-kvm/pve2/debian/patches/series
   pve-qemu-kvm/pve2/debian/rules
Log:
update to 0.14.1


Modified: pve-qemu-kvm/pve2/Makefile
===================================================================
--- pve-qemu-kvm/pve2/Makefile	2011-06-20 12:30:16 UTC (rev 6126)
+++ pve-qemu-kvm/pve2/Makefile	2011-06-21 04:41:23 UTC (rev 6127)
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 # also update debian/changelog
-KVMVER=0.14.0
+KVMVER=0.14.1
 KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm

Modified: pve-qemu-kvm/pve2/debian/changelog
===================================================================
--- pve-qemu-kvm/pve2/debian/changelog	2011-06-20 12:30:16 UTC (rev 6126)
+++ pve-qemu-kvm/pve2/debian/changelog	2011-06-21 04:41:23 UTC (rev 6127)
@@ -1,3 +1,14 @@
+pve-qemu-kvm (0.14.1-1) unstable; urgency=low
+
+  * update to upstream 0.14.1
+  
+  * remove enable-ksm.diff patch (newer libc already have those
+    definitions)
+  
+  * also install vgabios-qxl.bin vgabios-stdvga.bin vgabios-vmware.bin
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 21 Jun 2011 06:30:29 +0200
+
 pve-qemu-kvm (0.14.0-1) unstable; urgency=low
 
   * update to 0.14.0

Deleted: pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2011-06-20 12:30:16 UTC (rev 6126)
+++ pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2011-06-21 04:41:23 UTC (rev 6127)
@@ -1,17 +0,0 @@
-just define MADV_MERGEABLE
----
-
-Index: new/exec.c
-===================================================================
---- new.orig/exec.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/exec.c	2011-02-25 08:28:38.000000000 +0100
-@@ -59,6 +59,9 @@
- #endif
- #endif
- 
-+/* our libc does not define it */
-+#define MADV_MERGEABLE   12
-+
- //#define DEBUG_TB_INVALIDATE
- //#define DEBUG_FLUSH
- //#define DEBUG_TLB

Modified: pve-qemu-kvm/pve2/debian/patches/series
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/series	2011-06-20 12:30:16 UTC (rev 6126)
+++ pve-qemu-kvm/pve2/debian/patches/series	2011-06-21 04:41:23 UTC (rev 6127)
@@ -3,7 +3,6 @@
 fairsched.diff
 keymap.diff
 live-migration-fixes.diff
-enable-ksm.diff
 set-max-nics.patch
 use-local-linux-kvm-h.diff
 pve-auth.patch

Modified: pve-qemu-kvm/pve2/debian/rules
===================================================================
--- pve-qemu-kvm/pve2/debian/rules	2011-06-20 12:30:16 UTC (rev 6126)
+++ pve-qemu-kvm/pve2/debian/rules	2011-06-21 04:41:23 UTC (rev 6127)
@@ -85,7 +85,7 @@
 	# install gPXE bios images
 	install -m0644 debian/roms/*.bin $(destdir)/usr/share/kvm
 
-	for f in bios vgabios vgabios-cirrus; do \
+	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