Skip to content

Commit 10cb3fe

Browse files
authored
Merge pull request ceph#66122 from cbodley/wip-install-deps-gcc13
install-deps: warn about gcc older than 13 for el9 and later Reviewed-by: David Galloway <[email protected]> Reviewed-by: Zack Cerza <[email protected]>
2 parents cdb10d9 + 20f4bc9 commit 10cb3fe

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

install-deps.sh

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -522,33 +522,12 @@ else
522522
$SUDO dnf -y install --nogpgcheck https://dl.fedoraproject.org/pub/epel/epel-release-latest-$MAJOR_VERSION.noarch.rpm
523523
$SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
524524
$SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
525-
if test $ID = centos -a $MAJOR_VERSION = 8 ; then
526-
# for grpc-devel
527-
# See https://copr.fedorainfracloud.org/coprs/ceph/grpc/
528-
# epel is enabled for all major versions couple of lines above
529-
$SUDO dnf copr enable -y ceph/grpc
530-
531-
# Enable 'powertools' or 'PowerTools' repo
532-
$SUDO dnf config-manager --set-enabled $(dnf repolist --all 2>/dev/null|gawk 'tolower($0) ~ /^powertools\s/{print $1}')
533-
dts_ver=11
534-
# before EPEL8 and PowerTools provide all dependencies, we use sepia for the dependencies
535-
$SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
536-
$SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
537-
$SUDO dnf -y module enable javapackages-tools
538-
elif { [ "$ID" = centos ] || [ "$ID" = rocky ]; } && [ "$MAJOR_VERSION" -ge 9 ]; then
525+
if { [ "$ID" = centos ] || [ "$ID" = rocky ]; } && [ "$MAJOR_VERSION" -ge 9 ]; then
526+
dts_ver=13
539527
$SUDO dnf config-manager --set-enabled crb
540528
if [ "$MAJOR_VERSION" -eq 10 ]; then
541529
setup_lab_extras_repo
542530
fi
543-
elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then
544-
dts_ver=11
545-
$SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms"
546-
$SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
547-
$SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
548-
$SUDO dnf -y module enable javapackages-tools
549-
550-
# Enable ceph/grpc from copr for el8, this is needed for nvmeof management.
551-
$SUDO dnf copr enable -y ceph/grpc
552531
fi
553532
;;
554533
esac

0 commit comments

Comments
 (0)