[pve-devel] r5281 - in pve-qemu-kvm/trunk: . debian debian/patches
svn-commits at proxmox.com
svn-commits at proxmox.com
Mon Oct 25 08:10:59 CEST 2010
Author: dietmar
Date: 2010-10-25 06:10:59 +0000 (Mon, 25 Oct 2010)
New Revision: 5281
Modified:
pve-qemu-kvm/trunk/Makefile
pve-qemu-kvm/trunk/debian/changelog
pve-qemu-kvm/trunk/debian/control
pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
pve-qemu-kvm/trunk/debian/patches/fairsched.diff
pve-qemu-kvm/trunk/debian/patches/keymap.diff
pve-qemu-kvm/trunk/debian/patches/series
pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch
pve-qemu-kvm/trunk/debian/patches/vncticket.diff
pve-qemu-kvm/trunk/debian/rules
Log:
Modified: pve-qemu-kvm/trunk/Makefile
===================================================================
--- pve-qemu-kvm/trunk/Makefile 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/Makefile 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,8 +1,8 @@
RELEASE=1.6
# also update debian/changelog
-KVMVER=0.12.5
-KVMPKGREL=2
+KVMVER=0.13.0
+KVMPKGREL=1
KVMPACKAGE=pve-qemu-kvm
KVMDIR=qemu-kvm
Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/changelog 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,3 +1,9 @@
+pve-qemu-kvm (0.13.0-1) unstable; urgency=low
+
+ * update to qemu-kvm-0.13.0
+
+ -- Proxmox Support Team <support at proxmox.com> Thu, 21 Oct 2010 13:38:14 +0200
+
pve-qemu-kvm (0.12.5-2) unstable; urgency=low
* enable up to 32 NICs (as suggested in the forum)
Modified: pve-qemu-kvm/trunk/debian/control
===================================================================
--- pve-qemu-kvm/trunk/debian/control 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/control 2010-10-25 06:10:59 UTC (rev 5281)
@@ -11,6 +11,6 @@
Conflicts: qemu, qemu-kvm, kvm, pve-kvm, pve-qemu-kvm-2.6.18
Replaces: pve-kvm, pve-qemu-kvm-2.6.18
Description: Full virtualization on x86 hardware
- Using KVM, one can run multiple virtual PC:s, each running unmodified Linux or
+ Using KVM, one can run multiple virtual PCs, each running unmodified Linux or
Windows images. Each virtual machine has private virtualized hardware: a
network card, disk, graphics adapter, etc.
Modified: pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/adjust-path.diff 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/adjust-path.diff 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,26 +1,11 @@
-Index: test/configure
+Index: qemu-kvm/net.h
===================================================================
---- test.orig/configure 2010-05-11 08:18:56.000000000 +0200
-+++ test/configure 2010-05-11 08:18:58.000000000 +0200
-@@ -1975,8 +1975,8 @@
- prefix="/usr/local"
- fi
- mansuffix="/share/man"
-- datasuffix="/share/qemu"
-- docsuffix="/share/doc/qemu"
-+ datasuffix="/share/kvm"
-+ docsuffix="/share/doc/pve-qemu-kvm"
- binsuffix="/bin"
- fi
+--- qemu-kvm.orig/net.h 2010-10-21 13:40:20.000000000 +0200
++++ qemu-kvm/net.h 2010-10-21 13:50:57.000000000 +0200
+@@ -167,8 +167,8 @@
+ int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
+ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
-Index: test/net.h
-===================================================================
---- test.orig/net.h 2010-05-11 08:18:56.000000000 +0200
-+++ test/net.h 2010-05-11 08:18:58.000000000 +0200
-@@ -166,8 +166,8 @@
- void net_host_device_add(Monitor *mon, const QDict *qdict);
- void net_host_device_remove(Monitor *mon, const QDict *qdict);
-
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
Modified: pve-qemu-kvm/trunk/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/fairsched.diff 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/fairsched.diff 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,33 +1,34 @@
-Index: test/qemu-options.hx
+Index: qemu-kvm/qemu-options.hx
===================================================================
---- test.orig/qemu-options.hx 2010-05-11 08:15:36.000000000 +0200
-+++ test/qemu-options.hx 2010-05-11 08:17:02.000000000 +0200
-@@ -66,6 +66,12 @@
+--- qemu-kvm.orig/qemu-options.hx 2010-10-21 14:39:35.000000000 +0200
++++ qemu-kvm/qemu-options.hx 2010-10-21 14:41:52.000000000 +0200
+@@ -74,6 +74,12 @@
are split equally.
ETEXI
+DEF("id", HAS_ARG, QEMU_OPTION_id,
-+ "-id n set the faisched ID\n")
++ "-id n set the faisched ID\n", QEMU_ARCH_ALL)
+
+DEF("cpuunits", HAS_ARG, QEMU_OPTION_cpuunits,
-+ "-cpuuinits n set fairsched cpu units\n")
++ "-cpuuinits n set fairsched cpu units\n", QEMU_ARCH_ALL)
+
DEF("fda", HAS_ARG, QEMU_OPTION_fda,
- "-fda/-fdb file use 'file' as floppy disk 0/1 image\n")
- DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "")
-Index: test/vl.c
+ "-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
+ DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
+Index: qemu-kvm/vl.c
===================================================================
---- test.orig/vl.c 2010-05-11 08:15:37.000000000 +0200
-+++ test/vl.c 2010-05-11 08:18:10.000000000 +0200
-@@ -159,6 +159,7 @@
- #include "qemu-objects.h"
- #include "qemu-kvm.h"
- #include "hw/device-assignment.h"
-+#include "vzsyscalls.h"
+--- qemu-kvm.orig/vl.c 2010-10-21 14:39:35.000000000 +0200
++++ qemu-kvm/vl.c 2010-10-21 14:39:45.000000000 +0200
+@@ -152,6 +152,8 @@
+ #include "fsdev/qemu-fsdev.h"
+ #endif
++#include "vzsyscalls.h"
++
#include "disas.h"
-@@ -220,6 +221,7 @@
+ #include "qemu_socket.h"
+@@ -202,6 +204,7 @@
int singlestep = 0;
const char *assigned_devices[MAX_DEV_ASSIGN_CMDLINE];
int assigned_devices_index;
@@ -35,24 +36,15 @@
int smp_cpus = 1;
int max_cpus = 0;
int smp_cores = 1;
-@@ -363,7 +365,7 @@
- prctl(PR_SET_NAME, name);
- #endif
- }
--
-+
- /***************/
- /* ballooning */
-
-@@ -4911,6 +4913,7 @@
+@@ -1829,6 +1832,7 @@
+ {
const char *gdbstub_dev = NULL;
- uint32_t boot_devices_bitmap = 0;
int i;
+ int cpuunits = 0;
int snapshot, linux_boot;
+ const char *icount_option = NULL;
const char *initrd_filename;
- const char *kernel_filename, *kernel_cmdline;
-@@ -5573,6 +5576,20 @@
+@@ -2532,6 +2536,20 @@
exit(1);
}
break;
@@ -73,7 +65,7 @@
case QEMU_OPTION_vnc:
display_type = DT_VNC;
vnc_display = optarg;
-@@ -5973,6 +5990,39 @@
+@@ -2851,6 +2869,39 @@
if (ram_size == 0)
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
@@ -113,10 +105,10 @@
/* init the dynamic translator */
cpu_exec_init_all(tb_size * 1024 * 1024);
-Index: test/vzsyscalls.h
+Index: qemu-kvm/vzsyscalls.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ test/vzsyscalls.h 2010-05-11 08:17:02.000000000 +0200
++++ qemu-kvm/vzsyscalls.h 2010-10-21 14:39:45.000000000 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.
Modified: pve-qemu-kvm/trunk/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/keymap.diff 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/keymap.diff 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,7 +1,7 @@
-Index: test/curses.c
+Index: test/ui/curses.c
===================================================================
---- test.orig/curses.c 2010-05-11 08:15:36.000000000 +0200
-+++ test/curses.c 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/curses.c 2010-05-11 08:15:36.000000000 +0200
++++ test/ui/curses.c 2010-05-11 08:18:37.000000000 +0200
@@ -238,7 +238,11 @@
keysym = chr;
@@ -15,10 +15,10 @@
}
if (is_graphic_console()) {
-Index: test/keymaps.c
+Index: test/ui/keymaps.c
===================================================================
---- test.orig/keymaps.c 2010-05-11 08:15:36.000000000 +0200
-+++ test/keymaps.c 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/keymaps.c 2010-05-11 08:15:36.000000000 +0200
++++ test/ui/keymaps.c 2010-05-11 08:18:37.000000000 +0200
@@ -67,6 +67,7 @@
char * filename;
char line[1024];
@@ -151,10 +151,10 @@
}
int keycode_is_keypad(void *kbd_layout, int keycode)
-Index: test/keymaps.h
+Index: test/ui/keymaps.h
===================================================================
---- test.orig/keymaps.h 2010-05-11 08:15:36.000000000 +0200
-+++ test/keymaps.h 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/keymaps.h 2010-05-11 08:15:36.000000000 +0200
++++ test/ui/keymaps.h 2010-05-11 08:18:37.000000000 +0200
@@ -38,13 +38,26 @@
struct key_range *next;
};
@@ -193,10 +193,10 @@
int keycode_is_keypad(void *kbd_layout, int keycode);
int keysym_is_numlock(void *kbd_layout, int keysym);
-Index: test/sdl.c
+Index: test/ui/sdl.c
===================================================================
---- test.orig/sdl.c 2010-05-11 08:15:36.000000000 +0200
-+++ test/sdl.c 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/sdl.c 2010-05-11 08:15:36.000000000 +0200
++++ test/ui/sdl.c 2010-05-11 08:18:37.000000000 +0200
@@ -248,7 +248,11 @@
if (keysym == 92 && ev->keysym.scancode == 133) {
keysym = 0xa5;
@@ -210,10 +210,10 @@
}
/* specific keyboard conversions from scan codes */
-Index: test/vnc.c
+Index: test/ui/vnc.c
===================================================================
---- test.orig/vnc.c 2010-05-11 08:18:27.000000000 +0200
-+++ test/vnc.c 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/vnc.c 2010-05-11 08:18:27.000000000 +0200
++++ test/ui/vnc.c 2010-05-11 08:18:37.000000000 +0200
@@ -1443,27 +1443,85 @@
check_pointer_type_change(vs, kbd_mouse_is_absolute());
}
@@ -464,10 +464,10 @@
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
-Index: test/vnc.h
+Index: test/ui/vnc.h
===================================================================
---- test.orig/vnc.h 2010-05-11 08:18:27.000000000 +0200
-+++ test/vnc.h 2010-05-11 08:18:37.000000000 +0200
+--- test.orig/ui/vnc.h 2010-05-11 08:18:27.000000000 +0200
++++ test/ui/vnc.h 2010-05-11 08:18:37.000000000 +0200
@@ -49,6 +49,21 @@
*
*****************************************************************************/
Modified: pve-qemu-kvm/trunk/debian/patches/series
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/series 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/series 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,7 +1,7 @@
adjust-path.diff
fairsched.diff
vncticket.diff
-keymap.diff
-live-migration-fixes.diff
+#keymap.diff
+#live-migration-fixes.diff
enable-ksm.diff
set-max-nics.patch
Modified: pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,13 +1,13 @@
Index: qemu-kvm/net.h
===================================================================
---- qemu-kvm.orig/net.h 2010-10-06 08:20:46.000000000 +0200
-+++ qemu-kvm/net.h 2010-10-06 08:21:08.000000000 +0200
-@@ -119,7 +119,7 @@
+--- qemu-kvm.orig/net.h 2010-10-21 14:25:42.000000000 +0200
++++ qemu-kvm/net.h 2010-10-21 14:28:08.000000000 +0200
+@@ -122,7 +122,7 @@
/* NIC info */
-#define MAX_NICS 8
+#define MAX_NICS 32
- enum {
- NIC_NVECTORS_UNSPECIFIED = -1
- };
+
+ struct NICInfo {
+ uint8_t macaddr[6];
Modified: pve-qemu-kvm/trunk/debian/patches/vncticket.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/vncticket.diff 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/patches/vncticket.diff 2010-10-25 06:10:59 UTC (rev 5281)
@@ -1,8 +1,8 @@
-Index: test/console.h
+Index: qemu-kvm/console.h
===================================================================
---- test.orig/console.h 2010-05-11 08:15:36.000000000 +0200
-+++ test/console.h 2010-05-11 08:18:27.000000000 +0200
-@@ -322,7 +322,7 @@
+--- qemu-kvm.orig/console.h 2010-10-21 13:40:20.000000000 +0200
++++ qemu-kvm/console.h 2010-10-21 14:06:21.000000000 +0200
+@@ -368,7 +368,7 @@
void vnc_display_init(DisplayState *ds);
void vnc_display_close(DisplayState *ds);
int vnc_display_open(DisplayState *ds, const char *display);
@@ -11,11 +11,11 @@
void do_info_vnc_print(Monitor *mon, const QObject *data);
void do_info_vnc(Monitor *mon, QObject **ret_data);
char *vnc_display_local_addr(DisplayState *ds);
-Index: test/vnc.c
+Index: qemu-kvm/ui/vnc.c
===================================================================
---- test.orig/vnc.c 2010-05-11 08:15:37.000000000 +0200
-+++ test/vnc.c 2010-05-11 08:18:27.000000000 +0200
-@@ -1765,7 +1765,7 @@
+--- qemu-kvm.orig/ui/vnc.c 2010-10-21 13:40:21.000000000 +0200
++++ qemu-kvm/ui/vnc.c 2010-10-21 14:06:21.000000000 +0200
+@@ -1790,7 +1790,7 @@
static void set_pixel_conversion(VncState *vs)
{
if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -23,17 +23,17 @@
+ (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) &&
!memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
vs->write_pixels = vnc_write_pixels_copy;
- switch (vs->ds->surface->pf.bits_per_pixel) {
-@@ -1873,7 +1873,7 @@
- vnc_write_u8(vs, 0); /* msg id */
+ vnc_hextile_set_pixel_conversion(vs, 0);
+@@ -1876,7 +1876,7 @@
+ vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
vnc_write_u8(vs, 0);
vnc_write_u16(vs, 1); /* number of rects */
- vnc_framebuffer_update(vs, 0, 0, ds_get_width(vs->ds),
+ vnc_framebuffer_update(vs, 0, 0, ds_get_width(vs->ds),
ds_get_height(vs->ds), VNC_ENCODING_WMVi);
pixel_format_message(vs);
- vnc_flush(vs);
-@@ -2070,7 +2070,10 @@
+ vnc_unlock_output(vs);
+@@ -2079,7 +2079,10 @@
int i, j, pwlen;
unsigned char key[8];
@@ -45,7 +45,7 @@
VNC_DEBUG("No password configured on server");
vnc_write_u32(vs, 1); /* Reject auth */
if (vs->minor >= 8) {
-@@ -2446,7 +2449,7 @@
+@@ -2478,7 +2481,7 @@
#endif
}
@@ -54,7 +54,7 @@
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
-@@ -2461,6 +2464,7 @@
+@@ -2493,6 +2496,7 @@
if (password && password[0]) {
if (!(vs->password = qemu_strdup(password)))
return -1;
@@ -62,43 +62,51 @@
if (vs->auth == VNC_AUTH_NONE) {
vs->auth = VNC_AUTH_VNC;
}
-Index: test/vnc.h
+Index: qemu-kvm/ui/vnc.h
===================================================================
---- test.orig/vnc.h 2010-05-11 08:15:37.000000000 +0200
-+++ test/vnc.h 2010-05-11 08:18:27.000000000 +0200
-@@ -104,6 +104,7 @@
+--- qemu-kvm.orig/ui/vnc.h 2010-10-21 13:40:20.000000000 +0200
++++ qemu-kvm/ui/vnc.h 2010-10-21 14:06:21.000000000 +0200
+@@ -120,6 +120,7 @@
char *display;
char *password;
+ int retries;
int auth;
+ bool lossy;
#ifdef CONFIG_VNC_TLS
- int subauth; /* Used by VeNCrypt */
-Index: test/monitor.c
+Index: qemu-kvm/monitor.c
===================================================================
---- test.orig/monitor.c 2010-05-11 08:15:36.000000000 +0200
-+++ test/monitor.c 2010-05-11 08:18:27.000000000 +0200
-@@ -951,11 +951,17 @@
+--- qemu-kvm.orig/monitor.c 2010-10-21 13:40:21.000000000 +0200
++++ qemu-kvm/monitor.c 2010-10-21 14:14:38.000000000 +0200
+@@ -978,7 +978,7 @@
- static void change_vnc_password(const char *password)
+ static int change_vnc_password(const char *password)
{
-- if (vnc_display_password(NULL, password) < 0)
-+ if (vnc_display_password(NULL, password, 0) < 0)
- qemu_error_new(QERR_SET_PASSWD_FAILED);
-
+- if (vnc_display_password(NULL, password) < 0) {
++ if (vnc_display_password(NULL, password, 0) < 0) {
+ qerror_report(QERR_SET_PASSWD_FAILED);
+ return -1;
+ }
+@@ -986,6 +986,17 @@
+ return 0;
}
-+static void change_vnc_ticket(const char *password)
++static int change_vnc_ticket(const char *password)
+{
-+ if (vnc_display_password(NULL, password, 1) < 0)
-+ qemu_error_new(QERR_SET_PASSWD_FAILED);
++ if (vnc_display_password(NULL, password, 1) < 0) {
++ qerror_report(QERR_SET_PASSWD_FAILED);
++ return -1;
++ }
++
++ return 0;
+}
+
++
static void change_vnc_password_cb(Monitor *mon, const char *password,
void *opaque)
{
-@@ -966,12 +972,18 @@
- static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
+@@ -996,12 +1007,16 @@
+ static int do_change_vnc(Monitor *mon, const char *target, const char *arg)
{
if (strcmp(target, "passwd") == 0 ||
- strcmp(target, "password") == 0) {
@@ -108,16 +116,15 @@
char password[9];
strncpy(password, arg, sizeof(password));
password[sizeof(password) - 1] = '\0';
- change_vnc_password(password);
-+ if (strcmp(target, "ticket") == 0)
-+ change_vnc_ticket(password);
-+ else
-+ change_vnc_password(password);
-+
+- return change_vnc_password(password);
++ if (strcmp(target, "ticket") == 0)
++ return change_vnc_ticket(password);
++ else
++ return change_vnc_password(password);
} else {
- monitor_read_password(mon, change_vnc_password_cb, NULL);
+ return monitor_read_password(mon, change_vnc_password_cb, NULL);
}
-@@ -3360,11 +3372,11 @@
+@@ -3324,11 +3339,11 @@
static int is_valid_option(const char *c, const char *typestr)
{
char option[3];
@@ -131,7 +138,7 @@
typestr = strstr(typestr, option);
return (typestr != NULL);
}
-@@ -3586,7 +3598,7 @@
+@@ -3640,7 +3655,7 @@
p++;
if(c != *p) {
if(!is_valid_option(p, typestr)) {
Modified: pve-qemu-kvm/trunk/debian/rules
===================================================================
--- pve-qemu-kvm/trunk/debian/rules 2010-10-21 08:52:07 UTC (rev 5280)
+++ pve-qemu-kvm/trunk/debian/rules 2010-10-25 06:10:59 UTC (rev 5281)
@@ -33,9 +33,9 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- ./configure --prefix=/usr --with-kvm-trace --disable-xen
+ ./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen
- cd kvm/user/ && ./configure --prefix=/usr
+ cd kvm/test && ./configure --prefix=/usr
build: patch build-stamp
@@ -43,9 +43,9 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
+ $(MAKE) V=1
$(MAKE) -C kvm/libkvm
- $(MAKE) -C kvm/user
+ $(MAKE) -C kvm/test kvmtrace kvmtrace_format
#docbook-to-man debian/kvm.sgml > kvm.1
@@ -81,10 +81,10 @@
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/user/kvmtrace kvm/user/kvmtrace_format $(destdir)/usr/bin/
+ install -m 0755 kvm/kvm_stat kvm/test/kvmtrace kvm/test/kvmtrace_format $(destdir)/usr/bin/
# file `formats' is needed for kvmtrace_format
- install -Dp -m0644 kvm/user/formats $(destdir)/usr/share/kvm/formats
+ 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
More information about the pve-devel
mailing list