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

At build time any more, as of e01970d.

Required-githooks: true

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

debian/changelog

@@ -1,3 +1,9 @@
+daos (2.6.2-4) unstable; urgency=medium
+  [ Brian J. Murrell ]
+  * Remove Build-Depends: for UCX as they were obsoleted as of e01970d
+
+ -- Brian J. Murrell <[email protected]>  Mon, 15 Dec 2024 10:49:37 -0400
+
 daos (2.6.2-3) unstable; urgency=medium
   [ Kris Jacque ]
   * Bump minimum golang-go version to 1.21

debian/control

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

site_scons/prereq_tools/base.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Intel Corporation
+# Copyright 2016-2024 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -519,8 +519,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

@@ -15,7 +15,7 @@
 
 Name:          daos
 Version:       2.6.2
-Release:       2%{?relval}%{?dist}
+Release:       3%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -113,14 +113,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
@@ -323,7 +315,7 @@ This is the package that bridges the difference between the MOFED openmpi
 %endif
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 
@@ -598,6 +590,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Mon Dec 16 2024 Brian J. Murrell <[email protected]> - 2.6.2-4
+- Drop BRs for UCX as they were obsoleted as of e01970d
+
 * Wed Dec 11 2024 Kris Jacque <[email protected]> 2.6.2-3
 - Bump min supported go version to 1.21