Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ tests/*.pyc
.build
.build-ci
.cache

# Ignore PyPI build artifacts
dist/
150 changes: 75 additions & 75 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -452,70 +452,6 @@ substs.set('PREFIX', prefixdir)
substs.set('URL', 'https://github.com/linux-nvme/nvme-cli/')
substs.set('VERSION_MAJOR', libnvme_so_version.split('.')[0])

configure_file(
input: 'nvme.spec.in',
output: 'nvme.spec',
configuration: substs,
)

disc = configure_file(
input: 'etc/discovery.conf.in',
output: 'discovery.conf',
configuration: substs,
install: true,
install_dir: join_paths(sysconfdir, 'nvme'),
)

dracut_files = [
'70-nvmf-autoconnect.conf',
]

foreach file : dracut_files
configure_file(
input: 'nvmf-autoconnect/dracut-conf/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: dracutrulesdir,
)
endforeach

systemd_files = [
'nvmefc-boot-connections.service',
'nvmf-autoconnect.service',
'nvmf-connect-nbft.service',
'nvmf-connect.target',
'[email protected]',
]

foreach file : systemd_files
configure_file(
input: 'nvmf-autoconnect/systemd/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: systemddir,
)
endforeach

udev_files = [
'65-persistent-net-nbft.rules',
'70-nvmf-autoconnect.rules',
'70-nvmf-keys.rules',
'71-nvmf-hpe.rules',
'71-nvmf-netapp.rules',
'71-nvmf-vastdata.rules',
]

foreach file : udev_files
configure_file(
input: 'nvmf-autoconnect/udev-rules/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: udevrulesdir
)
endforeach

################################################################################
subdir('ccan') # declares: ccan_dep
Expand Down Expand Up @@ -563,22 +499,86 @@ if want_nvme
if get_option('nvme-tests')
subdir('tests')
endif

configure_file(
input: 'nvme.spec.in',
output: 'nvme.spec',
configuration: substs,
)

disc = configure_file(
input: 'etc/discovery.conf.in',
output: 'discovery.conf',
configuration: substs,
install: true,
install_dir: join_paths(sysconfdir, 'nvme'),
)

dracut_files = [
'70-nvmf-autoconnect.conf',
]

foreach file : dracut_files
configure_file(
input: 'nvmf-autoconnect/dracut-conf/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: dracutrulesdir,
)
endforeach

systemd_files = [
'nvmefc-boot-connections.service',
'nvmf-autoconnect.service',
'nvmf-connect-nbft.service',
'nvmf-connect.target',
'[email protected]',
]

foreach file : systemd_files
configure_file(
input: 'nvmf-autoconnect/systemd/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: systemddir,
)
endforeach

udev_files = [
'65-persistent-net-nbft.rules',
'70-nvmf-autoconnect.rules',
'70-nvmf-keys.rules',
'71-nvmf-hpe.rules',
'71-nvmf-netapp.rules',
'71-nvmf-vastdata.rules',
]

foreach file : udev_files
configure_file(
input: 'nvmf-autoconnect/udev-rules/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: udevrulesdir
)
endforeach

install_data(
'completions/bash-nvme-completion.sh',
rename: 'nvme',
install_dir: datadir / 'bash-completion/completions',
)
install_data(
'completions/_nvme',
install_dir: datadir / 'zsh/site-functions',
)
endif

subdir('Documentation')


################################################################################
install_data(
'completions/bash-nvme-completion.sh',
rename: 'nvme',
install_dir: datadir / 'bash-completion/completions',
)
install_data(
'completions/_nvme',
install_dir: datadir / 'zsh/site-functions',
)

################################################################################
path_dict = {
'prefixdir': prefixdir,
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ setup = [
"-Dnvme=disabled",
"-Dlibnvme=enabled",
"-Dpython=enabled",
"-Dtests=false",
"-Dnvme-tests=false",
"-Dexamples=false",
]