Skip to content

Commit f1c1e35

Browse files
authored
Merge pull request ceph#61949 from phlogistonjohn/jjm-c10s
build: a pair of needed changes to build on centos 10 stream Reviewed-by: Kefu Chai <[email protected]>
2 parents 7fcfe40 + de8b21d commit f1c1e35

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

do_cmake.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ if [ -r /etc/os-release ]; then
3030
;;
3131
almalinux|rocky|rhel|centos)
3232
MAJOR_VER=$(echo "$VERSION_ID" | sed -e 's/\..*$//')
33-
if [ "$MAJOR_VER" -ge "9" ] ; then
33+
if [ "$MAJOR_VER" -ge "10" ] ; then
34+
PYBUILD="3.12"
35+
elif [ "$MAJOR_VER" -ge "9" ] ; then
3436
PYBUILD="3.9"
3537
elif [ "$MAJOR_VER" -ge "8" ] ; then
3638
PYBUILD="3.6"

install-deps.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,8 @@ else
489489
$SUDO dnf -y module enable javapackages-tools
490490
elif test $ID = centos -a $MAJOR_VERSION = 9 ; then
491491
$SUDO dnf config-manager --set-enabled crb
492+
elif test $ID = centos -a $MAJOR_VERSION = 10 ; then
493+
$SUDO dnf config-manager --set-enabled crb
492494
elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then
493495
dts_ver=11
494496
$SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms"

0 commit comments

Comments
 (0)