install-deps,rpm: enable devtoolset-8 on aarch64 also

in 5ae3b06e, we left aarch64 with devtoolset-7, but aarch64 builders are
also suffering from http://tracker.ceph.com/issues/38892. so i installed
devtoolset-8 on all aarch64 builders manually from the rpm packages
downloaded from koji builder:

- https://cbs.centos.org/koji/buildinfo?buildID=24923
- https://cbs.centos.org/koji/buildinfo?buildID=24931

libasan5, libubsan1 are not installed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 00f19923b4225c25480ddb3c09a898a2444fbeb9)

diff --git a/ceph.spec.in b/ceph.spec.in
index 1e409fe5c6bb7294388ef1f15fd5c7c33a82c3ad..e6ca6d2919645fd122c1c6e8926a0b2bfea7d9e7 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -149,12 +149,8 @@ BuildRequires:     fuse-devel
 %if 0%{?rhel} == 7
 # devtoolset offers newer make and valgrind-devel, but the old ones are good
 # enough.
-%ifarch x86_64
 BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1
 %else
-BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
-%endif
-%else
 BuildRequires: gcc-c++
 %endif
 BuildRequires: gdbm

diff --git a/install-deps.sh b/install-deps.sh
index 8f671db1450a4df695962684685af643d0d9f92e..d4848ec328b61c329dba47784fe4995d102011ed 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -350,7 +350,7 @@ else
                            $SUDO yum -y install centos-release-scl-rh
                            $SUDO yum-config-manager --disable centos-sclo-rh
                            $SUDO yum-config-manager --enable centos-sclo-rh-testing
-                           dts_ver=7
+                           dts_ver=8
                            ;;
                    esac
                 elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then