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