nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Adding upstream version 2.7.1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:25:41 +01:00
parent 04338f02fe
commit d6e1a5d456
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
663 changed files with 15529 additions and 6994 deletions
Download patch file Download diff file Expand all files Collapse all files

21
meson.build
View file

@ -4,7 +4,7 @@ project(
'nvme-cli', ['c'],
meson_version: '>= 0.50.0',
license: 'GPL-2.0-only',
version: '2.6',
version: '2.7.1',
default_options: [
'c_std=gnu99',
'buildtype=debug',
@ -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.6', required: true,
libnvme_dep = dependency('libnvme', version: '>=1.7', required: true,
fallback : ['libnvme', 'libnvme_dep'])
libnvme_mi_dep = dependency('libnvme-mi', required: true,
fallback : ['libnvme', 'libnvme_mi_dep'])
@ -68,15 +68,6 @@ else
endif
conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c available?')
# Check for libhugetlbfs availability (optional)
if cc.has_header('hugetlbfs.h')
libhugetlbfs_dep = cc.find_library('hugetlbfs',
required : false)
else
libhugetlbfs_dep = dependency('', required: false)
endif
conf.set('CONFIG_LIBHUGETLBFS', libhugetlbfs_dep.found(), description: 'Is libhugetlbfs available?')
# Set the nvme-cli version
conf.set('NVME_VERSION', '"' + meson.project_version() + '"')
@ -222,6 +213,7 @@ endforeach
systemd_files = [
'nvmefc-boot-connections.service',
'nvmf-autoconnect.service',
'nvmf-connect-nbft.service',
'nvmf-connect.target',
'nvmf-connect@.service',
]
@ -235,8 +227,9 @@ foreach file : systemd_files
endforeach
udev_files = [
'65-persistent-net-nbft.rules',
'70-nvmf-autoconnect.rules',
'71-nvmf-iopolicy-netapp.rules',
'71-nvmf-netapp.rules',
]
foreach file : udev_files
@ -284,8 +277,7 @@ subdir('Documentation')
executable(
'nvme',
sources,
dependencies: [ libnvme_dep, libnvme_mi_dep, json_c_dep,
libhugetlbfs_dep ],
dependencies: [ libnvme_dep, libnvme_mi_dep, json_c_dep ],
link_args: '-ldl',
include_directories: incdir,
install: true,
@ -334,7 +326,6 @@ if meson.version().version_compare('>=0.53.0')
summary(path_dict, section: 'Paths')
dep_dict = {
'json-c': json_c_dep.found(),
'libhugetlbfs': libhugetlbfs_dep.found(),
}
summary(dep_dict, section: 'Dependencies')
conf_dict = {