DAOS-15079 test: install examples as part of spdk-tools

Skip-test: true Skip-unit-tests: true Required-githooks: true Signed-off-by: Tomasz Gromadzki <[email protected]>
daos-stack · Mar 8, 2024 · 9b4f113 · 9b4f113
1 parent 24d341d
commit 9b4f113
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/debian/libspdk3.dirs b/debian/libspdk3.dirs
@@ -1,2 +1 @@
 usr/share/spdk/scripts
-usr/include/spdk
diff --git a/debian/libspdk3.examples b/debian/libspdk3.examples
diff --git a/debian/libspdk3.install b/debian/libspdk3.install
@@ -1,5 +1,2 @@
 lib/x86_64-linux-gnu/lib*.so.*
 scripts/{setup,common}.sh usr/share/spdk/scripts
-include/spdk/pci_ids.h usr/include/spdk
-build/examples/spdk_lsvmd usr/bin/
-build/examples/spdk_nvme_manage usr/bin/
diff --git a/debian/rules b/debian/rules
@@ -56,8 +56,8 @@ override_dh_auto_build:
 	dh_auto_build -- CONFIG_ARCH=haswell V=1
 
 override_dh_auto_install:
-	cp build/examples/lsvmd build/examples/spdk_lsvmd
-	cp build/examples/nvme_manage build/examples/spdk_nvme_manage
+	mv build/examples/lsvmd build/examples/spdk_lsvmd
+	mv build/examples/nvme_manage build/examples/spdk_nvme_manage
 	dh_auto_install -- prefix=$(prefix) libdir=/lib/x86_64-linux-gnu/ datadir=$(prefix)/share
 
 override_dh_missing:

diff --git a/debian/spdk-tools.dirs b/debian/spdk-tools.dirs
@@ -1,2 +1,3 @@
+usr/include/spdk
 usr/share/spdk-tools/python
 usr/share/spdk-tools/python/rpc
diff --git a/debian/spdk-tools.install b/debian/spdk-tools.install
@@ -1,3 +1,6 @@
 usr/bin/*
 scripts/rpc.py usr/share/spdk-tools/python
-scripts/rpc/*.py usr/share/spdk-tools/python/rpc
+scripts/rpc/*.py usr/share/spdk-tools/python/rpc
+include/spdk/pci_ids.h usr/include/spdk
+build/examples/spdk_lsvmd usr/bin/
+build/examples/spdk_nvme_manage usr/bin/