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>

diff --git a/ceph.spec.in b/ceph.spec.in
index 9398e324ab2e53e63b588bee8dc6926b7c4f8d66..d681ecaa98e132b39a1b7f76bd01243f229875c9 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -150,12 +150,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 1441c51fd736c78e6abc5dbb94949bcbe1cfe4c9..45e2793cc8e7034bd90ffb5471bc99db046804bb 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -349,7 +349,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