Skip to content

Commit

Permalink
DAOS-14856 packaging: Move ld.so.conf.d file… (#13580)
Browse files Browse the repository at this point in the history
To the daos-server package as that is the only package that uses it.

Signed-off-by: Brian J. Murrell <[email protected]>
  • Loading branch information
brianjmurrell authored Jan 23, 2024
1 parent 3469328 commit b3c4b15
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.5.100-14) unstable; urgency=medium
[ Brian J. Murrell ]
* NOOP change to keep in parity with RPM version

-- Brian J. Murrell <[email protected]> Tue, 09 Jan 2024 13:59:01 -0500

daos (2.5.100-13) unstable; urgency=medium
[ Brian J. Murrell ]
* Update for EL 8.8 and Leap 15.5
Expand Down
8 changes: 6 additions & 2 deletions 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: 13%{?relval}%{?dist}
Release: 14%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -383,6 +383,7 @@ getent passwd daos_server >/dev/null || useradd -s /sbin/nologin -r -g daos_serv
%preun server
%systemd_preun %{server_svc_name}

# all of these macros are empty on EL so keep rpmlint happy
%if (0%{?suse_version} > 0)
%postun server
%{?run_ldconfig}
Expand All @@ -408,7 +409,6 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
%files
%defattr(-, root, root, -)
%doc README.md
%{_sysconfdir}/ld.so.conf.d/daos.conf
%dir %attr(0755,root,root) %{conf_dir}/certs
%config(noreplace) %{conf_dir}/memcheck-cart.supp
%dir %{conf_dir}
Expand All @@ -433,6 +433,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
%attr(2755,root,daos_server) %{_bindir}/daos_server
%{_bindir}/daos_engine
%{_bindir}/daos_metrics
%{_sysconfdir}/ld.so.conf.d/daos.conf
%dir %{_libdir}/daos_srv
%{_libdir}/daos_srv/libcont.so
%{_libdir}/daos_srv/libdtx.so
Expand Down Expand Up @@ -585,6 +586,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Tue Jan 09 2024 Brian J. Murrell <[email protected]> 2.5.100-14
- Move /etc/ld.so.conf.d/daos.conf to daos-server sub-package

* Wed Dec 06 2023 Brian J. Murrell <[email protected]> 2.5.100-13
- Update for EL 8.8 and Leap 15.5
- Update raft to 0.10.1-2.411.gefa15f4
Expand Down

0 comments on commit b3c4b15

Please sign in to comment.