1
0
Fork 0

Merging upstream version 2.2.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:18:36 +01:00
parent c6eb8bc90e
commit 965e6654c3
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
446 changed files with 8369 additions and 4059 deletions

View file

@ -2,9 +2,9 @@
################################################################################
project(
'nvme-cli', ['c'],
meson_version: '>= 0.47.0',
meson_version: '>= 0.48.0',
license: 'GPL-2.0-only',
version: '2.1.2',
version: '2.2.1',
default_options: [
'c_std=gnu99',
'buildtype=release',
@ -44,13 +44,10 @@ endif
conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
# Check for libnvme availability
libnvme_dep = dependency('libnvme', version: '>=1.1', required: true,
libnvme_dep = dependency('libnvme', version: '>=1.2', required: true,
fallback : ['libnvme', 'libnvme_dep'])
# Check for libuuid availability
libuuid_dep = dependency('uuid', required: true,
fallback : ['uuid', 'uuid_dep'])
conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid available?')
libnvme_mi_dep = dependency('libnvme-mi', required: true,
fallback : ['libnvme', 'libnvme_mi_dep'])
# Check for libjson-c availability
json_c_dep = dependency('json-c', required: true, version: '>=0.13',
@ -127,12 +124,12 @@ conf.set10(
)
conf.set10(
'HAVE_LITTLE_ENDIAN',
build_machine.endian() == 'little',
host_machine.endian() == 'little',
description: 'Building for little-endian'
)
conf.set10(
'HAVE_BIG_ENDIAN',
build_machine.endian() == 'big',
host_machine.endian() == 'big',
description: 'Building for big-endian'
)
conf.set10(
@ -245,8 +242,9 @@ sources = [
'nvme-models.c',
'nvme-print.c',
'nvme-rpmb.c',
'nvme-wrap.c',
'plugin.c',
'wrapper.c',
'libnvme-wrap.c',
]
subdir('ccan')
@ -258,7 +256,7 @@ subdir('Documentation')
executable(
'nvme',
sources,
dependencies: [ libnvme_dep, libuuid_dep, json_c_dep, libz_dep,
dependencies: [ libnvme_dep, libnvme_mi_dep, json_c_dep, libz_dep,
libhugetlbfs_dep ],
link_args: '-ldl',
include_directories: incdir,