Skip to content

Commit

Permalink
DAOS-15204 build: add crt_perf to packaging
Browse files Browse the repository at this point in the history
Required-githooks: true

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
  • Loading branch information
soumagne committed Feb 20, 2024
1 parent e9c0285 commit 7d2ffe3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.5.100-16) unstable; urgency=medium
[ Jerome Soumagne ]
* Add crt_perf binaries

-- Jerome Soumagne <jerome.soumagne@intel.com> Fri, 16 Feb 2024 10:30:00 -0600

daos (2.5.100-15) unstable; urgency=medium
[ Ryon Jensen ]
* NOOP change to keep in parity with RPM version
Expand Down Expand Up @@ -29,6 +35,7 @@ daos (2.5.100-12) unstable; urgency=medium

-- Tomasz Gromadzki <tomasz.gromadzki@intel.com> Fri, 17 Nov 2023 12:52:00 -0400

daos (2.5.100-11) unstable; urgency=medium
[ Jerome Soumagne ]
* Bump mercury min version to 2.3.1

Expand Down
4 changes: 4 additions & 0 deletions debian/daos-client-tests.install
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ usr/bin/daos_test
usr/bin/dfs_test
usr/bin/jobtest
usr/bin/crt_launch
usr/bin/crt_perf_server
usr/bin/crt_rate
usr/bin/crt_bw_read
usr/bin/crt_bw_write
usr/bin/daos_gen_io_conf
usr/bin/daos_run_io_conf
usr/lib64/libdpar.so
Expand Down
2 changes: 1 addition & 1 deletion utils/rpms/daos.rpmlintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addFilter("daos-client\.x86_64: E: post(i|u)n-without-ldconfig \/usr\/lib64\/lib
addFilter("daos-(client|server)\.x86_64: W: dangerous-command-in-%post(un)? rm")

# lots of missing manpages
addFilter("W: no-manual-page-for-binary (cart_ctl|daos_agent|dfuse|self_test|acl_dump_test|agent_tests|crt_launch|daos_debug_set_params|daos_gen_io_conf|daos_perf|daos_racer|daos_run_io_conf|daos_test|dfs_test|dfuse_test|drpc_engine_test|drpc_test|eq_tests|fault_status|hello_drpc|job_tests|jobtest|security_test|daos_firmware|daos_admin|daos_engine|daos_metrics|daos_server|daos_storage_estimator.py|evt_ctl|jump_pl_map|obj_ctl|pl_bench|rdbt|ring_pl_map|smd_ut|bio_ut|vea_stress|vea_ut|vos_perf|vos_tests)")
addFilter("W: no-manual-page-for-binary (cart_ctl|daos_agent|dfuse|self_test|acl_dump_test|agent_tests|crt_launch|crt_perf_server|crt_rate|crt_bw_read|crt_bw_write|daos_debug_set_params|daos_gen_io_conf|daos_perf|daos_racer|daos_run_io_conf|daos_test|dfs_test|dfuse_test|drpc_engine_test|drpc_test|eq_tests|fault_status|hello_drpc|job_tests|jobtest|security_test|daos_firmware|daos_admin|daos_engine|daos_metrics|daos_server|daos_storage_estimator.py|evt_ctl|jump_pl_map|obj_ctl|pl_bench|rdbt|ring_pl_map|smd_ut|bio_ut|vea_stress|vea_ut|vos_perf|vos_tests)")

addFilter("daos-(server|firmware)\.x86_64: W: non-standard-(u|g)id \/.+ daos_server")

Expand Down
9 changes: 8 additions & 1 deletion utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

Name: daos
Version: 2.5.100
Release: 15%{?relval}%{?dist}
Release: 16%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -521,6 +521,10 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
%config(noreplace) %{conf_dir}/fault-inject-cart.yaml
%{_bindir}/fault_status
%{_bindir}/crt_launch
%{_bindir}/crt_perf_server
%{_bindir}/crt_rate
%{_bindir}/crt_bw*
%{_bindir}/crt_launch
# For avocado tests
%{daoshome}/.build_vars.json
%{daoshome}/.build_vars.sh
Expand Down Expand Up @@ -586,6 +590,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Fri Feb 16 2024 Jerome Soumagne <jerome.soumagne@intel.com> 2.5.100-16
- Add crt_perf binaries

* Mon Feb 12 2024 Ryon Jensen <ryon.jensen@intel.com> 2.5.100-15
- Updated isa-l package name to match EPEL

Expand Down

0 comments on commit 7d2ffe3

Please sign in to comment.