Skip to content

Commit

Permalink
DAOS-15079 test: add examples installation for Debian to spdk-tools
Browse files Browse the repository at this point in the history
Skip-test: true
Skip-unit-tests: true
Required-githooks: true

Signed-off-by: Tomasz Gromadzki <[email protected]>
  • Loading branch information
grom72 committed Mar 8, 2024
1 parent 61a0c87 commit 57473fb
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Priority: optional
Maintainer: daos-stack <[email protected]>
Build-Depends:
debhelper,
python,
python3,
libdpdk-dev (>= 21.11.2),
librdmacm-dev,
libibverbs-dev,
Expand Down
2 changes: 1 addition & 1 deletion debian/libspdk-dev.install
Original file line number Diff line number Diff line change
@@ -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/*
1 change: 1 addition & 0 deletions debian/libspdk3.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/share/spdk/scripts
3 changes: 2 additions & 1 deletion debian/libspdk3.install
Original file line number Diff line number Diff line change
@@ -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
20 changes: 16 additions & 4 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

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 $@

Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions debian/spdk-tools.dirs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
usr/include/spdk
usr/share/spdk-tools/python
usr/share/spdk-tools/python/rpc
5 changes: 4 additions & 1 deletion debian/spdk-tools.install
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 57473fb

Please sign in to comment.