b10d49d761
Rewrite the implementation of the ssh block driver to use libssh instead of libssh2. The libssh library has various advantages over libssh2: - easier API for authentication (for example for using ssh-agent) - easier API for known_hosts handling - supports newer types of keys in known_hosts Use APIs/features available in libssh 0.8 conditionally, to support older versions (which are not recommended though). Adjust the iotest 207 according to the different error message, and to find the default key type for localhost (to properly compare the fingerprint with). Contributed-by: Max Reitz <mreitz@redhat.com> Adjust the various Docker/Travis scripts to use libssh when available instead of libssh2. The mingw/mxe testing is dropped for now, as there are no packages for it. Signed-off-by: Pino Toscano <ptoscano@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20190620200840.17655-1-ptoscano@redhat.com Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 5873173.t2JhDm7DL7@lindworm.usersys.redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
66 lines
2.4 KiB
Makefile
66 lines
2.4 KiB
Makefile
block-obj-y += raw-format.o vmdk.o vpc.o
|
|
block-obj-$(CONFIG_QCOW1) += qcow.o
|
|
block-obj-$(CONFIG_VDI) += vdi.o
|
|
block-obj-$(CONFIG_CLOOP) += cloop.o
|
|
block-obj-$(CONFIG_BOCHS) += bochs.o
|
|
block-obj-$(CONFIG_VVFAT) += vvfat.o
|
|
block-obj-$(CONFIG_DMG) += dmg.o
|
|
|
|
block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o qcow2-threads.o
|
|
block-obj-$(CONFIG_QED) += qed.o qed-l2-cache.o qed-table.o qed-cluster.o
|
|
block-obj-$(CONFIG_QED) += qed-check.o
|
|
block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
|
|
block-obj-y += quorum.o
|
|
block-obj-y += blkdebug.o blkverify.o blkreplay.o
|
|
block-obj-$(CONFIG_PARALLELS) += parallels.o
|
|
block-obj-y += blklogwrites.o
|
|
block-obj-y += block-backend.o snapshot.o qapi.o
|
|
block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o
|
|
block-obj-$(CONFIG_POSIX) += file-posix.o
|
|
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
|
|
block-obj-y += null.o mirror.o commit.o io.o create.o
|
|
block-obj-y += throttle-groups.o
|
|
block-obj-$(CONFIG_LINUX) += nvme.o
|
|
|
|
block-obj-y += nbd.o
|
|
block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o
|
|
block-obj-$(CONFIG_LIBISCSI) += iscsi.o
|
|
block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
|
|
block-obj-$(CONFIG_LIBNFS) += nfs.o
|
|
block-obj-$(CONFIG_CURL) += curl.o
|
|
block-obj-$(CONFIG_RBD) += rbd.o
|
|
block-obj-$(CONFIG_GLUSTERFS) += gluster.o
|
|
block-obj-$(CONFIG_VXHS) += vxhs.o
|
|
block-obj-$(CONFIG_LIBSSH) += ssh.o
|
|
block-obj-y += accounting.o dirty-bitmap.o
|
|
block-obj-y += write-threshold.o
|
|
block-obj-y += backup.o
|
|
block-obj-$(CONFIG_REPLICATION) += replication.o
|
|
block-obj-y += throttle.o copy-on-read.o
|
|
|
|
block-obj-y += crypto.o
|
|
|
|
common-obj-y += stream.o
|
|
|
|
nfs.o-libs := $(LIBNFS_LIBS)
|
|
iscsi.o-cflags := $(LIBISCSI_CFLAGS)
|
|
iscsi.o-libs := $(LIBISCSI_LIBS)
|
|
curl.o-cflags := $(CURL_CFLAGS)
|
|
curl.o-libs := $(CURL_LIBS)
|
|
rbd.o-cflags := $(RBD_CFLAGS)
|
|
rbd.o-libs := $(RBD_LIBS)
|
|
gluster.o-cflags := $(GLUSTERFS_CFLAGS)
|
|
gluster.o-libs := $(GLUSTERFS_LIBS)
|
|
vxhs.o-libs := $(VXHS_LIBS)
|
|
ssh.o-cflags := $(LIBSSH_CFLAGS)
|
|
ssh.o-libs := $(LIBSSH_LIBS)
|
|
block-obj-dmg-bz2-$(CONFIG_BZIP2) += dmg-bz2.o
|
|
block-obj-$(if $(CONFIG_DMG),m,n) += $(block-obj-dmg-bz2-y)
|
|
dmg-bz2.o-libs := $(BZIP2_LIBS)
|
|
block-obj-$(if $(CONFIG_LZFSE),m,n) += dmg-lzfse.o
|
|
dmg-lzfse.o-libs := $(LZFSE_LIBS)
|
|
qcow.o-libs := -lz
|
|
linux-aio.o-libs := -laio
|
|
parallels.o-cflags := $(LIBXML2_CFLAGS)
|
|
parallels.o-libs := $(LIBXML2_LIBS)
|