From 97e473ca1969f6fceeb4f542503b0255a77bfdc6 Mon Sep 17 00:00:00 2001
From: Martin Belanger <martin.belanger@dell.com>
Date: Fri, 9 Jan 2026 06:36:21 -0500
Subject: [PATCH] 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 <martin.belanger@dell.com>
---
 .gitignore     |   3 +
 meson.build    | 150 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   3 +
 3 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/.gitignore b/.gitignore
index f1b504ee46..2d2a793e38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ tests/*.pyc
 .build
 .build-ci
 .cache
+
+# Ignore PyPI build artifacts
+dist/
diff --git a/meson.build b/meson.build
index 603b15e922..8948d2c032 100644
--- a/meson.build
+++ b/meson.build
@@ -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',
-    'nvmf-connect@.service',
-]
-
-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
@@ -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',
+        'nvmf-connect@.service',
+    ]
+
+    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,
diff --git a/pyproject.toml b/pyproject.toml
index 87bfaaaf9c..af5806a11c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,4 +37,7 @@ setup = [
     "-Dnvme=disabled",
     "-Dlibnvme=enabled",
     "-Dpython=enabled",
+    "-Dtests=false",
+    "-Dnvme-tests=false",
+    "-Dexamples=false",
 ]