]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build dependencies: centos9 55330/head
authorAlexander Indenbaum <aindenba@redhat.com>
Fri, 26 Jan 2024 19:50:19 +0000 (19:50 +0000)
committerAlexander Indenbaum <aindenba@redhat.com>
Fri, 26 Jan 2024 19:56:31 +0000 (19:56 +0000)
- 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 <aindenba@redhat.com>
ceph.spec.in
install-deps.sh

index 058c79c5e7f829ac667e40adb6040489fc437a10..c0dbe41b726316db08f1ee54ee11a5c7cea5075f 100644 (file)
@@ -213,6 +213,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
index a334a3b29a3042f8ecdb8220e4581679c12d90a6..257c43111e6cb0f2ef0d0f112989f1a46c19b200 100755 (executable)
@@ -545,6 +545,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"