define QEMU_PKGVERSION

diff --git a/Makefile b/Makefile
index 7842e1d3983e0cd9b2b72b66dc34c8188697e1cc..f92f1c47b3ab95110f016049ec7ec4a2043371ab 100644 (file)
--- 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 (file)
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 465145ad464d52543e1e5283a346fb72766dfa08..aaf76aa402257ee7dc76ff59f7fdf142daaa1bc2 100644 (file)
--- 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