Skip to content

Commit f90daa1

Browse files
Martin Belangerigaw
authored andcommitted
PyPI: Do not install/build nvme components
Do not build the test code and do not install nvme-specific config file under {prefix}/etc when building PyPI code. Signed-off-by: Martin Belanger <[email protected]>
1 parent c284f2b commit f90daa1

3 files changed

Lines changed: 81 additions & 75 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ tests/*.pyc
1919
.build
2020
.build-ci
2121
.cache
22+
23+
# Ignore PyPI build artifacts
24+
dist/

meson.build

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -452,70 +452,6 @@ substs.set('PREFIX', prefixdir)
452452
substs.set('URL', 'https://github.com/linux-nvme/nvme-cli/')
453453
substs.set('VERSION_MAJOR', libnvme_so_version.split('.')[0])
454454

455-
configure_file(
456-
input: 'nvme.spec.in',
457-
output: 'nvme.spec',
458-
configuration: substs,
459-
)
460-
461-
disc = configure_file(
462-
input: 'etc/discovery.conf.in',
463-
output: 'discovery.conf',
464-
configuration: substs,
465-
install: true,
466-
install_dir: join_paths(sysconfdir, 'nvme'),
467-
)
468-
469-
dracut_files = [
470-
'70-nvmf-autoconnect.conf',
471-
]
472-
473-
foreach file : dracut_files
474-
configure_file(
475-
input: 'nvmf-autoconnect/dracut-conf/' + file + '.in',
476-
output: file,
477-
configuration: substs,
478-
install: true,
479-
install_dir: dracutrulesdir,
480-
)
481-
endforeach
482-
483-
systemd_files = [
484-
'nvmefc-boot-connections.service',
485-
'nvmf-autoconnect.service',
486-
'nvmf-connect-nbft.service',
487-
'nvmf-connect.target',
488-
489-
]
490-
491-
foreach file : systemd_files
492-
configure_file(
493-
input: 'nvmf-autoconnect/systemd/' + file + '.in',
494-
output: file,
495-
configuration: substs,
496-
install: true,
497-
install_dir: systemddir,
498-
)
499-
endforeach
500-
501-
udev_files = [
502-
'65-persistent-net-nbft.rules',
503-
'70-nvmf-autoconnect.rules',
504-
'70-nvmf-keys.rules',
505-
'71-nvmf-hpe.rules',
506-
'71-nvmf-netapp.rules',
507-
'71-nvmf-vastdata.rules',
508-
]
509-
510-
foreach file : udev_files
511-
configure_file(
512-
input: 'nvmf-autoconnect/udev-rules/' + file + '.in',
513-
output: file,
514-
configuration: substs,
515-
install: true,
516-
install_dir: udevrulesdir
517-
)
518-
endforeach
519455

520456
################################################################################
521457
subdir('ccan') # declares: ccan_dep
@@ -563,22 +499,86 @@ if want_nvme
563499
if get_option('nvme-tests')
564500
subdir('tests')
565501
endif
502+
503+
configure_file(
504+
input: 'nvme.spec.in',
505+
output: 'nvme.spec',
506+
configuration: substs,
507+
)
508+
509+
disc = configure_file(
510+
input: 'etc/discovery.conf.in',
511+
output: 'discovery.conf',
512+
configuration: substs,
513+
install: true,
514+
install_dir: join_paths(sysconfdir, 'nvme'),
515+
)
516+
517+
dracut_files = [
518+
'70-nvmf-autoconnect.conf',
519+
]
520+
521+
foreach file : dracut_files
522+
configure_file(
523+
input: 'nvmf-autoconnect/dracut-conf/' + file + '.in',
524+
output: file,
525+
configuration: substs,
526+
install: true,
527+
install_dir: dracutrulesdir,
528+
)
529+
endforeach
530+
531+
systemd_files = [
532+
'nvmefc-boot-connections.service',
533+
'nvmf-autoconnect.service',
534+
'nvmf-connect-nbft.service',
535+
'nvmf-connect.target',
536+
537+
]
538+
539+
foreach file : systemd_files
540+
configure_file(
541+
input: 'nvmf-autoconnect/systemd/' + file + '.in',
542+
output: file,
543+
configuration: substs,
544+
install: true,
545+
install_dir: systemddir,
546+
)
547+
endforeach
548+
549+
udev_files = [
550+
'65-persistent-net-nbft.rules',
551+
'70-nvmf-autoconnect.rules',
552+
'70-nvmf-keys.rules',
553+
'71-nvmf-hpe.rules',
554+
'71-nvmf-netapp.rules',
555+
'71-nvmf-vastdata.rules',
556+
]
557+
558+
foreach file : udev_files
559+
configure_file(
560+
input: 'nvmf-autoconnect/udev-rules/' + file + '.in',
561+
output: file,
562+
configuration: substs,
563+
install: true,
564+
install_dir: udevrulesdir
565+
)
566+
endforeach
567+
568+
install_data(
569+
'completions/bash-nvme-completion.sh',
570+
rename: 'nvme',
571+
install_dir: datadir / 'bash-completion/completions',
572+
)
573+
install_data(
574+
'completions/_nvme',
575+
install_dir: datadir / 'zsh/site-functions',
576+
)
566577
endif
567578

568579
subdir('Documentation')
569580

570581

571-
################################################################################
572-
install_data(
573-
'completions/bash-nvme-completion.sh',
574-
rename: 'nvme',
575-
install_dir: datadir / 'bash-completion/completions',
576-
)
577-
install_data(
578-
'completions/_nvme',
579-
install_dir: datadir / 'zsh/site-functions',
580-
)
581-
582582
################################################################################
583583
path_dict = {
584584
'prefixdir': prefixdir,

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ setup = [
3737
"-Dnvme=disabled",
3838
"-Dlibnvme=enabled",
3939
"-Dpython=enabled",
40+
"-Dtests=false",
41+
"-Dnvme-tests=false",
42+
"-Dexamples=false",
4043
]

0 commit comments

Comments
 (0)