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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-25 07:46:30 +0100 (Fri, 25 Feb 2011)
New Revision: 5619

Modified:
   pve-qemu-kvm/trunk/debian/changelog
   pve-qemu-kvm/trunk/debian/control
   pve-qemu-kvm/trunk/debian/patches/vncticket.diff
   pve-qemu-kvm/trunk/debian/rules
Log:
more fixes


Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2011-02-25 06:10:50 UTC (rev 5618)
+++ pve-qemu-kvm/trunk/debian/changelog	2011-02-25 06:46:30 UTC (rev 5619)
@@ -2,6 +2,10 @@
 
   * update to 0.14.0
   
+  * enable unit tests --enable-check-utests
+  
+  * removed kvmtrace (removed from upstream?)
+  
   * add vnc keyboard fixes for fr-ca (reported by Pierre-Yves)
 
  -- Proxmox Support Team <support at proxmox.com>  Fri, 25 Feb 2011 06:37:52 +0100

Modified: pve-qemu-kvm/trunk/debian/control
===================================================================
--- pve-qemu-kvm/trunk/debian/control	2011-02-25 06:10:50 UTC (rev 5618)
+++ pve-qemu-kvm/trunk/debian/control	2011-02-25 06:46:30 UTC (rev 5619)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libpci-dev, quilt, etherboot (>= 5.4.4), texi2html
+Build-Depends: debhelper (>= 5), autotools-dev, libpci-dev, quilt, etherboot (>= 5.4.4), texi2html, check
 Standards-Version: 3.7.2
 
 Package: pve-qemu-kvm

Modified: pve-qemu-kvm/trunk/debian/patches/vncticket.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/vncticket.diff	2011-02-25 06:10:50 UTC (rev 5618)
+++ pve-qemu-kvm/trunk/debian/patches/vncticket.diff	2011-02-25 06:46:30 UTC (rev 5619)
@@ -1,7 +1,7 @@
 Index: new/console.h
 ===================================================================
 --- new.orig/console.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/console.h	2011-02-25 06:45:23.000000000 +0100
++++ new/console.h	2011-02-25 07:22:17.000000000 +0100
 @@ -368,7 +368,7 @@
  void vnc_display_init(DisplayState *ds);
  void vnc_display_close(DisplayState *ds);
@@ -14,7 +14,7 @@
 Index: new/ui/vnc.c
 ===================================================================
 --- new.orig/ui/vnc.c	2011-02-25 06:39:51.000000000 +0100
-+++ new/ui/vnc.c	2011-02-25 06:51:48.000000000 +0100
++++ new/ui/vnc.c	2011-02-25 07:38:07.000000000 +0100
 @@ -1794,7 +1794,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
@@ -65,7 +65,7 @@
 Index: new/ui/vnc.h
 ===================================================================
 --- new.orig/ui/vnc.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/ui/vnc.h	2011-02-25 06:53:06.000000000 +0100
++++ new/ui/vnc.h	2011-02-25 07:22:17.000000000 +0100
 @@ -120,6 +120,7 @@
  
      char *display;
@@ -77,7 +77,7 @@
 Index: new/monitor.c
 ===================================================================
 --- new.orig/monitor.c	2011-02-25 06:39:52.000000000 +0100
-+++ new/monitor.c	2011-02-25 06:57:46.000000000 +0100
++++ new/monitor.c	2011-02-25 07:39:39.000000000 +0100
 @@ -1041,7 +1041,7 @@
      return 0;
  }
@@ -123,6 +123,15 @@
          } else {
              return monitor_read_password(mon, change_vnc_password_cb, NULL);
          }
+@@ -1152,7 +1156,7 @@
+         }
+         /* Note that setting an empty password will not disable login through
+          * this interface. */
+-        rc = vnc_display_password(NULL, password);
++        rc = vnc_display_password(NULL, password, 0);
+         if (rc != 0) {
+             qerror_report(QERR_SET_PASSWD_FAILED);
+             return -1;
 @@ -3978,11 +3982,11 @@
  static int is_valid_option(const char *c, const char *typestr)
  {

Modified: pve-qemu-kvm/trunk/debian/rules
===================================================================
--- pve-qemu-kvm/trunk/debian/rules	2011-02-25 06:10:50 UTC (rev 5618)
+++ pve-qemu-kvm/trunk/debian/rules	2011-02-25 06:46:30 UTC (rev 5619)
@@ -33,10 +33,8 @@
 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
+	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --disable-blobs --enable-check-utests
 
-	cd kvm/test && ./configure --prefix=/usr
-
 build: patch build-stamp
 
 build-stamp:  config.status
@@ -44,8 +42,6 @@
 
 	# Add here commands to compile the package.
 	$(MAKE) V=1
-	$(MAKE) -C kvm/libkvm
-	$(MAKE) -C kvm/test kvmtrace kvmtrace_format
 
 	#docbook-to-man debian/kvm.sgml > kvm.1
 
@@ -81,11 +77,8 @@
 	mv $(destdir)/usr/share/man/man1/qemu.1 $(destdir)/usr/share/man/man1/kvm.1
 
 	# Install the userspace utilities
-	install -m 0755 kvm/kvm_stat kvm/test/kvmtrace kvm/test/kvmtrace_format $(destdir)/usr/bin/
+	install -m 0755 kvm/kvm_stat $(destdir)/usr/bin/
 
-	# file `formats' is needed for kvmtrace_format	
-	install -Dp -m0644 kvm/test/formats $(destdir)/usr/share/kvm/formats
-
 	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