From nobody Sun Feb 8 13:33:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894091; cv=none; d=zohomail.com; s=zohoarc; b=gYBN72amvLPGAFU1zUf78DwINKiR/pmFGYtMIpYPK2G1s16JxBFMYxCVutMQ8vU/9bMZc5jWutAy69ZqI8iO3udo0iOKWjSLnFEi/Mh8v/TGFICxYmN6nHfXH9xlXaBuPULeCkjKTpuN38LovMxdCSJ+eP8AeXbgLOUT+Cxlbs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894091; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KDOwwiOb8I0mb1urC0zp4MrXyKqyeoXAvS6PePevB4=; b=L+HjC3V7nJjGp426kWhovUF3SztNHYciFwmGAG0+hcJxcnxtabVim32OFUOdKpClpw/SX4TLXmN6mCoui/lC5EtZYVvugXxEVN2kOLwV6EoF1aExWmQTwu5ianvCyZM0PQ5wdl2Jcd8+FsuofaRwOkya6mK95lBCo87HmBSmzwY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894091419938.4145472511943; Thu, 16 Jul 2020 03:08:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-NsKlmepnMUC7pTskvnZO6g-1; Thu, 16 Jul 2020 06:08:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD2FF108B; Thu, 16 Jul 2020 10:08:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D1F578492; Thu, 16 Jul 2020 10:08:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5A7BF1809547; Thu, 16 Jul 2020 10:08:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA4t7Q018170 for ; Thu, 16 Jul 2020 06:04:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BDD12DE9C; Thu, 16 Jul 2020 10:04:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B95802DE72 for ; Thu, 16 Jul 2020 10:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894090; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0KDOwwiOb8I0mb1urC0zp4MrXyKqyeoXAvS6PePevB4=; b=RF4pm6l3AegzfVA2RRDlpbMJ3La38Y2ecy4lSxnFIG3MshIe6MsOl7LQ7dZztpHvv19XPo MQusPjmUh7v1sc6kebmnF2EVCn6jg24wRZnuM0KKBmstC3ySmGE5zrG4J9CSSdId6y7oBT 95i+EwAoc44/R1AC/2FN976++osRmlI= X-MC-Unique: NsKlmepnMUC7pTskvnZO6g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 192/351] meson: src: build libvirt_storage_backend_sheepdog.so shared module Date: Thu, 16 Jul 2020 11:57:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 1 - src/storage/Makefile.inc.am | 30 ------------------------------ src/storage/meson.build | 25 +++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e309a96cbb3..ec6da9a6ff5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,6 @@ nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -noinst_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index b52a9e79e63..ebb700eb160 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_SHEEPDOG_SOURCES =3D \ - storage/storage_backend_sheepdog.h \ - storage/storage_backend_sheepdog.c \ - storage/storage_backend_sheepdog_priv.h \ - $(NULL) - STORAGE_DRIVER_GLUSTER_SOURCES =3D \ storage/storage_backend_gluster.h \ storage/storage_backend_gluster.c \ @@ -118,30 +112,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -noinst_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog_priv.la - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog.la -libvirt_storage_backend_sheepdog_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_sheepdog_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_SHEEPDOG - if WITH_STORAGE_GLUSTER libvirt_storage_backend_gluster_la_SOURCES =3D \ $(STORAGE_DRIVER_GLUSTER_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index 3663b530d69..ae36f3e829e 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -44,6 +44,10 @@ storage_backend_scsi_sources =3D [ 'storage_backend_scsi.c', ] =20 +storage_backend_sheepdog_sources =3D [ + 'storage_backend_sheepdog.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 @@ -169,3 +173,24 @@ if conf.has('WITH_STORAGE_SCSI') 'install_dir': storage_backend_install_dir, } endif + +if conf.has('WITH_STORAGE_SHEEPDOG') + storage_backend_sheepdog_priv_lib =3D static_library( + 'virt_storage_backend_sheepdog_priv', + storage_backend_sheepdog_sources, + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) + + virt_modules +=3D { + 'name': 'virt_storage_backend_sheepdog', + 'link_whole': [ + storage_backend_sheepdog_priv_lib, + ], + 'install_dir': storage_backend_install_dir, + } +endif --=20 2.26.2