[PATCH 4/5] build: Drop the 'storage_sheepdog' build option completely

Currently the build option is accepted and unless explicitly enabled the build works just fine. In case it's desired we can completely remove the build option and then the packagers will need to stop passing them. --- libvirt.spec.in | 2 -- meson.build | 4 ---- meson_options.txt | 1 - 3 files changed, 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4066d5509b..b199c624b8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1170,7 +1170,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_disk=enabled \ -Dstorage_mpath=enabled \ %{?arg_storage_rbd} \ - -Dstorage_sheepdog=disabled \ %{?arg_storage_gluster} \ %{?arg_storage_zfs} \ -Dstorage_vstorage=disabled \ @@ -1282,7 +1281,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_mpath=disabled \ -Dstorage_rbd=disabled \ -Dstorage_scsi=disabled \ - -Dstorage_sheepdog=disabled \ -Dstorage_vstorage=disabled \ -Dstorage_zfs=disabled \ -Dsysctl_config=disabled \ diff --git a/meson.build b/meson.build index abfae91ee9..8d0debaaf4 100644 --- a/meson.build +++ b/meson.build @@ -1916,10 +1916,6 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_SCSI', 1) endif - if not get_option('storage_sheepdog').disabled() - error('The sheepdog storage backend is no longer supported') - endif - if not get_option('storage_vstorage').disabled() vstorage_enable = true if host_machine.system() != 'linux' diff --git a/meson_options.txt b/meson_options.txt index 00b6df8254..861c5577d2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -88,7 +88,6 @@ option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM backend option('storage_mpath', type: 'feature', value: 'auto', description: 'mpath backend for the storage driver') option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS Block Device backend for the storage driver') option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI backend for the storage driver') -option('storage_sheepdog', type: 'feature', value: 'disabled', description: 'option flag preserved for compatibility') option('storage_vstorage', type: 'feature', value: 'auto', description: 'Virtuozzo storage backend for the storage driver') option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS backend for the storage driver') -- 2.37.1