Skip to content

Commit 6fc20ff

Browse files
committed
devtoolset-11 fixups
1 parent a700f78 commit 6fc20ff

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

‎ci/centos-7-setup-devtoolset-11.sh‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo yum install -y centos-release-scl
2-
rm /etc/yum.repos.d/CentOS-SCLo-scl.repo
3-
sed -i 's,^#baseurl.*$,baseurl=https://vault.centos.org/7.9.2009/sclo/x86_64/rh/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
4-
sed -i ',mirrorlist,d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
2+
sudo rm -f /etc/yum.repos.d/CentOS-SCLo-scl.repo
3+
sudo sed -i 's,^#baseurl.*$,baseurl=https://vault.centos.org/7.9.2009/sclo/x86_64/rh/,' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
4+
sudo sed -i '/mirrorlist/d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
55
sudo yum update
66
sudo yum install -y devtoolset-11
7-
# add source /opt/rh/devtoolset-11/enable to /usr/lib/rpm/find-debuginfo.sh at the top of the file just after the shebang
7+
sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh

‎ci/fix-buildhost.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
thisdir=$(dirname "$0")"
3+
4+
if [ -f /etc/os-release ]; then
5+
source /etc/os-release
6+
if [ "$ID" = "centos" ] && [ "VERSION_ID" = "7" ]; then
7+
8+
./centos-7-setup-devtoolset-11.sh
9+
fi
10+
fi

0 commit comments

Comments
 (0)