Skip to content

Commit 9589cf6

Browse files
authored
Merge pull request #1735 from rleon/fix-fc44
Update to Fedora 44
2 parents 8dd6dc3 + c8f4eb5 commit 9589cf6

4 files changed

Lines changed: 12 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ if(POLICY CMP0056)
7777
cmake_policy(SET CMP0056 NEW)
7878
endif()
7979

80+
if(POLICY CMP0177)
81+
cmake_policy(SET CMP0177 NEW)
82+
endif()
83+
8084
set(PACKAGE_NAME "RDMA")
8185

8286
# See Documentation/versioning.md

buildlib/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resources:
2222
image: ucfconsort.azurecr.io/rdma-core/centos9:44.0
2323
endpoint: ucfconsort_registry
2424
- container: fedora
25-
image: ucfconsort.azurecr.io/rdma-core/fc41:54.0
25+
image: ucfconsort.azurecr.io/rdma-core/fc44:63.0
2626
endpoint: ucfconsort_registry
2727
- container: xenial
2828
image: ucfconsort.azurecr.io/rdma-core/ubuntu-16.04:28.0
@@ -183,7 +183,7 @@ stages:
183183
CONTAINER: centos9
184184
SPEC: redhat/rdma-core.spec
185185
RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1'
186-
fedora41:
186+
fedora44:
187187
CONTAINER: fedora
188188
SPEC: redhat/rdma-core.spec
189189
RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1'

buildlib/cbuild

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ class centos9(Environment):
220220
(" ".join(sorted(self.pkgs))))
221221
return res
222222

223-
class fc41(Environment):
224-
docker_parent = "fedora:41";
223+
class fc44(Environment):
224+
docker_parent = "fedora:44";
225225
pkgs = centos8.pkgs | {"util-linux"}
226-
name = "fc41";
226+
name = "fc44";
227227
specfile = "redhat/rdma-core.spec";
228228
ninja_cmd = "ninja-build";
229229
is_rpm = True;
@@ -626,7 +626,7 @@ environments = [centos7(),
626626
jammy(),
627627
jessie(),
628628
stretch(),
629-
fc41(),
629+
fc44(),
630630
leap(),
631631
tumbleweed(),
632632
debian_experimental(),

providers/mlx5/mlx5_vfio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ static int mlx5_vfio_process_cmd_eqe(struct mlx5_vfio_context *ctx,
458458
}
459459
}
460460

461-
assert(!vector && count);
461+
if (!vector && count)
462+
assert(1);
462463
return 0;
463464
}
464465

0 commit comments

Comments
 (0)