From 7c05f07cf6cd98e01f2668bf3b8eef6a8ce7b997 Mon Sep 17 00:00:00 2001 From: Alexander Indenbaum Date: Fri, 26 Jan 2024 19:50:19 +0000 Subject: [PATCH] build dependencies: centos9 - ceph.spec.in: declare git as build dependency - install-deps.sh: enable CRB repo Test procedure: docker run --rm -ti -v /home/baum/ceph-ci:/home/ceph quay.io/centos/centos:stream9 bash [root@a3c4b1545e93 /]# cd /home/ceph/ [root@a3c4b1545e93 ceph]# ./install-deps.sh 2>&1 tee install-deps.log Signed-off-by: Alexander Indenbaum (cherry picked from commit 11a37da05305420ca37f5a3af5b8991e1e2967cb) --- ceph.spec.in | 1 + install-deps.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index de390039a8fba..81f2c8abf1255 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -211,6 +211,7 @@ BuildRequires: selinux-policy-devel BuildRequires: gperf BuildRequires: cmake > 3.5 BuildRequires: fuse-devel +BuildRequires: git %if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} == 9 || 0%{?openEuler} BuildRequires: gcc-c++ >= 11 %endif diff --git a/install-deps.sh b/install-deps.sh index 7f9754f958835..a90f72587bb4c 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -536,6 +536,8 @@ else $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/ $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save $SUDO dnf -y module enable javapackages-tools + elif test $ID = centos -a $MAJOR_VERSION = 9 ; then + $SUDO dnf config-manager --set-enabled crb elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then dts_ver=11 $SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms" -- 2.39.5