cbuild: Update to Fedora 37

Latest release

Signed-off-by: Jason Gunthorpe <[email protected]>

buildlib/azure-pipelines.yml

@@ -34,7 +34,7 @@ resources:
  image: ucfconsort.azurecr.io/rdma-core/centos8:25.0
  endpoint: ucfconsort_registry
  - container: fedora
- image: ucfconsort.azurecr.io/rdma-core/fc35:38.0
+ image: ucfconsort.azurecr.io/rdma-core/fc37:44.0
  endpoint: ucfconsort_registry
  - container: xenial
  image: ucfconsort.azurecr.io/rdma-core/ubuntu-16.04:28.0
@@ -198,7 +198,7 @@ stages:
  CONTAINER: centos8
  SPEC: redhat/rdma-core.spec
  RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1'
- fedora35:
+ fedora37:
  CONTAINER: fedora
  SPEC: redhat/rdma-core.spec
  RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1'

buildlib/cbuild

@@ -235,10 +235,10 @@ class centos8(Environment):
  " ".join(sorted(self.pkgs))));
  return res;
 
-class fc35(Environment):
- docker_parent = "fedora:35";
- pkgs = centos8.pkgs
- name = "fc35";
+class fc37(Environment):
+ docker_parent = "fedora:37";
+ pkgs = centos8.pkgs | {"util-linux"}
+ name = "fc37";
  specfile = "redhat/rdma-core.spec";
  ninja_cmd = "ninja-build";
  is_rpm = True;
@@ -566,7 +566,7 @@ environments = [centos6(),
  focal(),
  jessie(),
  stretch(),
- fc35(),
+ fc37(),
  leap(),
  tumbleweed(),
  debian_experimental(),

redhat/rdma-core.spec

@@ -25,7 +25,9 @@ BuildRequires: pkgconfig(libnl-3.0)
 BuildRequires: pkgconfig(libnl-route-3.0)
 BuildRequires: /usr/bin/rst2man
 BuildRequires: valgrind-devel
+%if 0%{?fedora} < 37
 BuildRequires: systemd
+%endif
 BuildRequires: systemd-devel
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
 %define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: %{?!_without_pyverbs: 1} %{?_without_pyverbs: 0}}