From c0f8cf66e2c721ebb0d9a792f2565f63966c1eac Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Thu, 4 Jul 2019 20:14:29 +0000 Subject: [PATCH] scripts: update configure-hypervisor script to support QEMU 4.1 QEMU >= 4.1 uses libssh not libssh2 fixes #627 Signed-off-by: Julio Montes --- scripts/configure-hypervisor.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/configure-hypervisor.sh b/scripts/configure-hypervisor.sh index 3f29f7fe9a..1c0c2d6c9b 100755 --- a/scripts/configure-hypervisor.sh +++ b/scripts/configure-hypervisor.sh @@ -226,7 +226,13 @@ generate_qemu_options() { qemu_options+=(size:--disable-glusterfs) qemu_options+=(size:--disable-libiscsi) qemu_options+=(size:--disable-libnfs) - qemu_options+=(size:--disable-libssh2) + + # Starting from QEMU 4.1, libssh replaces to libssh2 + if [ "$(echo "${qemu_version_major}.${qemu_version_minor}" >= 4.1 | bc)" == "1" ]; then + qemu_options+=(size:--disable-libssh) + else + qemu_options+=(size:--disable-libssh2) + fi # Disable unused compression support qemu_options+=(size:--disable-bzip2)