DAOS-15079 test: add examples installation for Debian to spdk-tools

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

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -41,5 +41,5 @@
 //@Library(value="pipeline-lib@your_branch") _
 
 /* groovylint-disable-next-line CompileStatic */
-packageBuildingPipelineDAOSTest(['distros': ['el8', 'el9', 'leap15', 'ubuntu20.04'],
+packageBuildingPipelineDAOSTest(['distros': ['ubuntu20.04', 'el8', 'el9', 'leap15'],
                                 'test-tag': 'pr'])
diff --git a/debian/changelog b/debian/changelog
@@ -3,7 +3,7 @@ spdk (22.01.2-6) unstable; urgency=medium
   [ Tomasz Gromadzki ]
   * Add rpc.py to spdk-tools package.
   * Synchronize Debian package with RPMs by adding examples to spdk-tools package.
-  
+
  --  Tomasz Gromadzki <[email protected]>  Tue, 05 Mar 2024 00:00:00 +0000
 
 spdk (22.01.2-3) unstable; urgency=medium

diff --git a/debian/libspdk-dev.install b/debian/libspdk-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
 lib/x86_64-linux-gnu/lib*.so
 lib/x86_64-linux-gnu/lib*.a
-lib/x86_64-linux-gnu/pkgconfig/*
+lib/x86_64-linux-gnu/pkgconfig/*
diff --git a/debian/libspdk3.dirs b/debian/libspdk3.dirs
@@ -0,0 +1 @@
+usr/share/spdk/scripts
diff --git a/debian/libspdk3.install b/debian/libspdk3.install
@@ -1 +1,2 @@
-lib/x86_64-linux-gnu/lib*.so.*
+lib/x86_64-linux-gnu/lib*.so.*
+scripts/{setup,common}.sh usr/share/spdk/scripts
diff --git a/debian/rules b/debian/rules
@@ -6,6 +6,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # https://github.com/spdk/spdk/issues/2011
 export DEB_CFLAGS_MAINT_APPEND = $(shell pkg-config --cflags libdpdk)
 
+prefix := /usr
+buildroot := debian/tmp
+
+cflags := -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS \
+	-fexceptions -fstack-protector-strong -grecord-gcc-switches -m64 -mtune=generic \
+	-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
+
 %:
 	dh $@
 
@@ -41,12 +48,17 @@ override_dh_auto_configure:
 	            --without-vtune           \
 	            --with-shared
 
-#override_dh_auto_build:
-#	make V=1 # -j 8
+override_dh_auto_build:
+	export CFLAGS='$(cflags)'
+	export CXXFLAGS='$(cflags)'
+	export FFLAGS='$(cflags)'
+	export LDFLAGS='-Wl,-z,relro -Wl,-z,now'
+	dh_auto_build -- CONFIG_ARCH=haswell V=1
 
 override_dh_auto_install:
-	dh_auto_install -- prefix=/usr libdir=/lib/x86_64-linux-gnu/ datadir=/usr/share
-
+	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:
 	dh_missing --fail-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/