From 9c87d2d37c1716848659bf2c75b7874321434fa6 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 5 Dec 2017 22:18:34 +0800 Subject: [PATCH] ceph{-,dev-,dev-new-}build: enable testing repo for arm64 the devtoolset-7 for aarch64 is not offered by centos-sclo-rh repo, but at least centos-sclo-rh-testing has devtoolset-6. see https://github.com/sclorg/centos-release-scl see https://buildlogs.centos.org/centos/7/sclo/aarch64/rh/ Fixes: http://tracker.ceph.com/issues/22301 Signed-off-by: Kefu Chai --- ceph-build/build/setup_rpm | 8 +++++++- ceph-dev-build/build/setup_rpm | 8 +++++++- ceph-dev-new-build/build/setup_rpm | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 8d2d0402..d5e50fb6 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -30,7 +30,13 @@ cd ceph-* pwd $SUDO yum install -y yum-utils -$SUDO yum install -y centos-release-scl +if [ "$ARCH" = x86_64 ]; then + $SUDO yum install -y centos-release-scl +elif [ "$ARCH" = arm64 ]; then + $SUDO yum install -y centos-release-scl-rh + $SUDO yum-config-manager --disable centos-sclo-rh + $SUDO yum-config-manager --enable centos-sclo-rh-testing +fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec $SUDO yum-builddep -y $DIR/ceph.spec diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 0e96eb06..ae0b5e30 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -30,7 +30,13 @@ cd ceph-* pwd $SUDO yum install -y yum-utils -$SUDO yum install -y centos-release-scl +if [ "$ARCH" = x86_64 ]; then + $SUDO yum install -y centos-release-scl +elif [ "$ARCH" = arm64 ]; then + $SUDO yum install -y centos-release-scl-rh + $SUDO yum-config-manager --disable centos-sclo-rh + $SUDO yum-config-manager --enable centos-sclo-rh-testing +fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec $SUDO yum-builddep -y $DIR/ceph.spec diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 0e96eb06..ae0b5e30 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -30,7 +30,13 @@ cd ceph-* pwd $SUDO yum install -y yum-utils -$SUDO yum install -y centos-release-scl +if [ "$ARCH" = x86_64 ]; then + $SUDO yum install -y centos-release-scl +elif [ "$ARCH" = arm64 ]; then + $SUDO yum install -y centos-release-scl-rh + $SUDO yum-config-manager --disable centos-sclo-rh + $SUDO yum-config-manager --enable centos-sclo-rh-testing +fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec $SUDO yum-builddep -y $DIR/ceph.spec -- 2.47.3