1
0
Fork 0

Merging upstream version 2.14.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-05-22 13:00:36 +02:00
parent 0d9181726f
commit f268303a51
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
572 changed files with 4636 additions and 1730 deletions

View file

@ -4,7 +4,7 @@ project(
'nvme-cli', ['c'],
meson_version: '>= 0.50.0',
license: 'GPL-2.0-only',
version: '2.13',
version: '2.14',
default_options: [
'c_std=gnu99',
'buildtype=debugoptimized',
@ -48,7 +48,7 @@ conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
conf.set('RUNDIR', '"@0@"'.format(rundir))
# Check for libnvme availability
libnvme_dep = dependency('libnvme', version: '>=1.13', required: true,
libnvme_dep = dependency('libnvme', version: '>=1.14', required: true,
fallback : ['libnvme', 'libnvme_dep'])
libnvme_mi_dep = dependency('libnvme-mi', required: true,
fallback : ['libnvme', 'libnvme_mi_dep'])
@ -254,6 +254,7 @@ udev_files = [
'70-nvmf-autoconnect.rules',
'70-nvmf-keys.rules',
'71-nvmf-netapp.rules',
'71-nvmf-vastdata.rules',
]
foreach file : udev_files
@ -282,6 +283,7 @@ sources = [
'nvme-wrap.c',
'plugin.c',
'libnvme-wrap.c',
'logging.c',
]
if json_c_dep.found()
sources += [