DAOS-13292 build: Don't need UCX libraries … (#15016)

At build time any more, as of e01970d.

Signed-off-by: Brian J. Murrell <[email protected]>

debian/changelog

@@ -1,3 +1,9 @@
+daos (2.7.100-9) unstable; urgency=medium
+  [ Brian J. Murrell ]
+  * Remove Build-Depends: for UCX as they were obsoleted as of e01970d
+
+ -- Brian J. Murrell <[email protected]>  Tue, 15 Oct 2024 10:49:37 -0400
+
 daos (2.7.100-8) unstable; urgency=medium
   [ Cedric Koch-Hofer]
   * Update BR: argobots to 1.2
@@ -49,7 +55,7 @@ daos (2.7.100-2) unstable; urgency=medium
   * Add pciutils runtime dep for daos_server lspci call
   * Add libpci-dev build dep for pciutils CGO bindings
 
- -- Tom Nabarro <[email protected]>>  Thu, 24 Jun 2024 16:55:00 -0000
+ -- Tom Nabarro <[email protected]>>  Mon, 24 Jun 2024 16:55:00 -0000
 
 daos (2.7.100-1) unstable; urgency=medium
   [ Phillip Henderson ]

debian/control

@@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 10),
                python3-dev,
                python3-distro,
                libabt-dev (>= 1.2),
-               libucx-dev,
                libpmemobj-dev (>= 2.1.0),
                libfuse3-dev,
                libprotobuf-c-dev,

site_scons/prereq_tools/base.py

@@ -529,8 +529,7 @@ def __init__(self, env, opts):
 
     def run_build(self, opts):
         """Build and dependencies"""
-        # argobots is not really needed by client but it's difficult to separate
-        common_reqs = ['ucx', 'ofi', 'hwloc', 'mercury', 'boost', 'uuid', 'crypto', 'protobufc',
+        common_reqs = ['ofi', 'hwloc', 'mercury', 'boost', 'uuid', 'crypto', 'protobufc',
                        'lz4', 'isal', 'isal_crypto']
         client_reqs = ['fuse', 'json-c', 'capstone', 'aio']
         server_reqs = ['argobots', 'pmdk', 'spdk', 'ipmctl']

utils/rpms/daos.spec

@@ -16,7 +16,7 @@
 
 Name:          daos
 Version:       2.7.100
-Release:       8%{?relval}%{?dist}
+Release:       9%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -114,14 +114,6 @@ BuildRequires: systemd-rpm-macros
 %endif
 BuildRequires: libuuid-devel
 
-%if (0%{?suse_version} > 0)
-BuildRequires: libucp-devel
-BuildRequires: libucs-devel
-BuildRequires: libuct-devel
-%else
-BuildRequires: ucx-devel
-%endif
-
 Requires: openssl
 # This should only be temporary until we can get a stable upstream release
 # of mercury, at which time the autoprov shared library version should
@@ -324,7 +316,7 @@ This is the package that bridges the difference between the MOFED openmpi
 %endif
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 
@@ -600,6 +592,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Tue Oct 15 2024 Brian J. Murrell <[email protected]> - 2.7.100-9
+- Drop BRs for UCX as they were obsoleted as of e01970d
+
 * Mon Oct 07 2024 Cedric Koch-Hofer <[email protected]> 2.7.100-8
 - Update BR: argobots to 1.2