From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 23 Oct 2015 07:41:40 +0000 (+0200)
Subject: define QEMU_PKGVERSION
X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=commitdiff_plain;h=b6e85098c8b88f609d2bca5bf19fa8e85b176c15

define QEMU_PKGVERSION
---

diff --git a/Makefile b/Makefile
index 7842e1d..f92f1c4 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,8 @@ ${DEBS} kvm: ${KVMSRC}
 	tar xf ${KVMSRC} 
 	cp -a debian ${KVMDIR}/debian
 	echo "git clone git://git.proxmox.com/git/pve-qemu-kvm.git\\ngit checkout ${GITVERSION}" > ${KVMDIR}/debian/SOURCE
+	# set package version
+	sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' ${KVMDIR}/configure
 	cd ${KVMDIR}; dpkg-buildpackage -b -rfakeroot -us -uc
 	lintian ${DEBS} || true
 
diff --git a/debian/patches/fix-emulator-version-string.patch b/debian/patches/fix-emulator-version-string.patch
new file mode 100644
index 0000000..6cf849b
--- /dev/null
+++ b/debian/patches/fix-emulator-version-string.patch
@@ -0,0 +1,18 @@
+use whith spave between VERSION and QEMU_PKGVERSION
+
+Our kvm version parser expects a white space ot comma after version,
+see PVE::QemuServer::kvm_user_version()
+
+Index: new/vl.c
+===================================================================
+--- new.orig/vl.c
++++ new/vl.c
+@@ -1913,7 +1913,7 @@ static void main_loop(void)
+ 
+ static void version(void)
+ {
+-    printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
++    printf("QEMU emulator version " QEMU_VERSION " " QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
+ }
+ 
+ static void help(int exitcode)
diff --git a/debian/patches/series b/debian/patches/series
index 465145a..aaf76aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ jemalloc.patch
 mirror-fix-coroutine-reentrance.patch
 0001-smm_available-false.patch
 mirror-fix-zero-init.patch
+fix-emulator-version-string.patch