From b090f37a6bd33bf5e3d8ec983837d6ae5ad65c03 Mon Sep 17 00:00:00 2001 From: Emmanuel Kasper Date: Mon, 16 Oct 2017 13:21:42 +0200 Subject: [PATCH] Provides a qemu-system-x86 virtual package This allows adding additional debian packages on pve hosts which depends on a qemu binary being installed. The following install paths were tested: * install of proxmox-ve on debian systems with standard package set: works as expected * install of proxmox-ve on debian having the debian qemu package installed: refused by the package manager as expected, until qemu, qemu-system-x86, libspice-server1 are deinstalled * manual install of qemu-system-x86 after proxmox-ve is installed: refused by the package manager as expected, until libspice-server1 is installed. If libspice-server1 is installed then proxmox-ve is deinstalled. * install of packages depending on qemu-system-x86 having proxmox-ve installed: thoses packages are installed as expected, no conflict Acked-by: Wolfgang Bumiller --- debian/control | 5 ++++- debian/pve-qemu-kvm.links | 11 +++++++++++ debian/rules | 3 --- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 debian/pve-qemu-kvm.links diff --git a/debian/control b/debian/control index 4a55323..f7b3aee 100644 --- a/debian/control +++ b/debian/control @@ -51,10 +51,13 @@ Conflicts: kvm, pve-qemu-kvm-2.6.18, qemu, qemu-kvm, + qemu-system-x86, qemu-utils, -Provides: qemu-utils, +Provides: qemu-system-x86, + qemu-utils, Replaces: pve-kvm, pve-qemu-kvm-2.6.18, + qemu-system-x86, qemu-utils, Description: Full virtualization on x86 hardware Using KVM, one can run multiple virtual PCs, each running unmodified Linux or diff --git a/debian/pve-qemu-kvm.links b/debian/pve-qemu-kvm.links new file mode 100644 index 0000000..8749a89 --- /dev/null +++ b/debian/pve-qemu-kvm.links @@ -0,0 +1,11 @@ +usr/bin/qemu-system-x86_64 usr/bin/kvm + +# qemu-system-i386 and qemu-system-x86_64 provides the same hardware emulation +usr/bin/qemu-system-x86_64 usr/bin/qemu-system-i386 + +# upstream provides a qemu man page, +# we symlink to kvm for backward compatibility +# and to qemu-system-{i386,x86_64} to fullfill our 'Provides: qemu-system-x86' +usr/share/man/man1/qemu.1 usr/share/man/man1/kvm.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-i386.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-x86_64.1 diff --git a/debian/rules b/debian/rules index 1114f99..9396228 100755 --- a/debian/rules +++ b/debian/rules @@ -86,9 +86,6 @@ install: build # Add here commands to install the package into debian/pve-kvm. $(MAKE) DESTDIR=$(destdir) install - mv $(destdir)/usr/bin/qemu-system-$(ARCH) $(destdir)/usr/bin/kvm - mv $(destdir)/usr/share/man/man1/qemu.1 $(destdir)/usr/share/man/man1/kvm.1 - # we do not need openbios files (sparc/ppc) rm -rf $(destdir)/usr/share/kvm/openbios-* # remove ppc files