diff options
| author | Casey Bodley <cbodley@redhat.com> | 2022-02-24 19:26:13 +0100 |
|---|---|---|
| committer | Kefu Chai <tchaikov@gmail.com> | 2022-07-30 04:05:04 +0200 |
| commit | 797da436481403315787f5dbf5de29ebf1e7e2f3 (patch) | |
| tree | 3fd5408daa96b3997beeacb6fed9793c696675df /install-deps.sh | |
| parent | Revert "install-deps.sh: drop devtoolset(DTS) check for centos" (diff) | |
| download | ceph-797da436481403315787f5dbf5de29ebf1e7e2f3.tar.xz ceph-797da436481403315787f5dbf5de29ebf1e7e2f3.zip | |
install-deps.sh: centos/rhel require gcc 10.2 and devtoolset-10
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'install-deps.sh')
| -rwxr-xr-x | install-deps.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/install-deps.sh b/install-deps.sh index a10844d8c88..46acea373b3 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -226,7 +226,7 @@ function version_lt { function ensure_decent_gcc_on_rh { local old=$(gcc -dumpversion) - local expected=5.1 + local expected=10.2 local dts_ver=$1 if version_lt $old $expected; then if test -t 1; then @@ -429,13 +429,13 @@ EOF case "$ARCH" in x86_64) $SUDO dnf -y install centos-release-scl - dts_ver=8 + dts_ver=10 ;; aarch64) $SUDO dnf -y install centos-release-scl-rh $SUDO dnf config-manager --disable centos-sclo-rh $SUDO dnf config-manager --enable centos-sclo-rh-testing - dts_ver=8 + dts_ver=10 ;; esac # before EPEL8 and PowerTools provide all dependencies, we use sepia for the dependencies @@ -447,7 +447,7 @@ EOF --enable rhel-server-rhscl-8-rpms \ --enable rhel-8-server-optional-rpms \ --enable rhel-8-server-devtools-rpms - dts_ver=8 + dts_ver=10 $SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms" $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 |